HeapSupplements are now just Supplements.

third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

 /*
  * Copyright (c) 2013, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 125 matching lines @@
     if (LocalDOMWindow* window = eventTarget.toDOMWindow())
         return fromInternal(*window);
 
     ASSERT(eventTarget.getExecutionContext()->isWorkerGlobalScope());
     return ImageBitmapFactories::fromInternal(*toWorkerGlobalScope(eventTarget.getExecutionContext()));
 }
 
 template<class GlobalObject>
 ImageBitmapFactories& ImageBitmapFactories::fromInternal(GlobalObject& object)
 {
-    ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(HeapSupplement<GlobalObject>::from(object, supplementName()));
+    ImageBitmapFactories* supplement = static_cast<ImageBitmapFactories*>(Supplement<GlobalObject>::from(object, supplementName()));
     if (!supplement) {
-        supplement = new ImageBitmapFactories();
-        HeapSupplement<GlobalObject>::provideTo(object, supplementName(), supplement);
+        supplement = new ImageBitmapFactories;
+        Supplement<GlobalObject>::provideTo(object, supplementName(), supplement);
     }
     return *supplement;
 }
 
 void ImageBitmapFactories::addLoader(ImageBitmapLoader* loader)
 {
     m_pendingLoaders.add(loader);
 }
 
 void ImageBitmapFactories::didFinishLoading(ImageBitmapLoader* loader)
@@ skipping 12 matching lines @@
 }
 
 void ImageBitmapFactories::ImageBitmapLoader::loadBlobAsync(ExecutionContext* context, Blob* blob)
 {
     m_loader.start(context, blob->blobDataHandle());
 }
 
 DEFINE_TRACE(ImageBitmapFactories)
 {
     visitor->trace(m_pendingLoaders);
-    HeapSupplement<LocalDOMWindow>::trace(visitor);
-    HeapSupplement<WorkerGlobalScope>::trace(visitor);
+    Supplement<LocalDOMWindow>::trace(visitor);
+    Supplement<WorkerGlobalScope>::trace(visitor);
 }
 
 void ImageBitmapFactories::ImageBitmapLoader::rejectPromise()
 {
     m_resolver->reject(DOMException::create(InvalidStateError, "The source image cannot be decoded."));
     m_factory->didFinishLoading(this);
 }
 
 void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading()
 {
@@ skipping 65 matching lines @@
     m_factory->didFinishLoading(this);
 }
 
 DEFINE_TRACE(ImageBitmapFactories::ImageBitmapLoader)
 {
     visitor->trace(m_factory);
     visitor->trace(m_resolver);
 }
 
 } // namespace blink