Bug 1495645 - Followup merge bustage fix r=hiro
authorCameron McCormack <cam@mcc.id.au>
Thu, 04 Oct 2018 00:42:28 +0000
changeset 439507 da259f95580506589a87462b31d7585578e735a4
parent 439506 e1b7e9c180815febe1ac11baaa3e2de677624e92
child 439508 1f268b2058c9e498547c2a902127fa45a93673f8
push id34777
push usernbeleuzu@mozilla.com
push dateThu, 04 Oct 2018 09:26:06 +0000
treeherdermozilla-central@f87eeba88f1c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershiro
bugs1495645
milestone64.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1495645 - Followup merge bustage fix r=hiro Differential Revision: https://phabricator.services.mozilla.com/D7675
layout/style/nsCSSValue.cpp
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -1371,18 +1371,18 @@ css::ImageValue::ImageValue(nsIURI* aURI
 
 css::ImageValue::ImageValue(ServoRawOffsetArc<RustString> aString,
                             already_AddRefed<URLExtraData> aExtraData,
                             CORSMode aCORSMode)
   : URLValueData(aString, std::move(aExtraData), aCORSMode)
 {
 }
 
-void
-css::ImageValue::Initialize(nsIDocument* aDocument)
+imgRequestProxy*
+css::ImageValue::LoadImage(nsIDocument* aDocument)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
   static uint64_t sNextLoadID = 1;
 
   if (mLoadID == 0) {
     mLoadID = sNextLoadID++;
   }