Bug 1310560 - Part 2: Remove unused EqualImages and EqualURIs functions. r=xidorn
MozReview-Commit-ID: 28nyrNMcxXq
--- a/layout/style/nsStyleStruct.cpp
+++ b/layout/style/nsStyleStruct.cpp
@@ -44,59 +44,32 @@ using namespace mozilla;
static_assert((((1 << nsStyleStructID_Length) - 1) &
~(NS_STYLE_INHERIT_MASK)) == 0,
"Not enough bits in NS_STYLE_INHERIT_MASK");
/* static */ const int32_t nsStyleGridLine::kMinLine;
/* static */ const int32_t nsStyleGridLine::kMaxLine;
static bool
-EqualURIs(nsIURI *aURI1, nsIURI *aURI2)
-{
- bool eq;
- return aURI1 == aURI2 || // handle null==null, and optimize
- (aURI1 && aURI2 &&
- NS_SUCCEEDED(aURI1->Equals(aURI2, &eq)) && // not equal on fail
- eq);
-}
-
-static bool
DefinitelyEqualURIs(css::URLValueData* aURI1,
css::URLValueData* aURI2)
{
return aURI1 == aURI2 ||
(aURI1 && aURI2 && aURI1->DefinitelyEqualURIs(*aURI2));
}
static bool
DefinitelyEqualURIsAndPrincipal(css::URLValueData* aURI1,
css::URLValueData* aURI2)
{
return aURI1 == aURI2 ||
(aURI1 && aURI2 && aURI1->DefinitelyEqualURIsAndPrincipal(*aURI2));
}
static bool
-EqualImages(imgIRequest *aImage1, imgIRequest* aImage2)
-{
- if (aImage1 == aImage2) {
- return true;
- }
-
- if (!aImage1 || !aImage2) {
- return false;
- }
-
- nsCOMPtr<nsIURI> uri1, uri2;
- aImage1->GetURI(getter_AddRefs(uri1));
- aImage2->GetURI(getter_AddRefs(uri2));
- return EqualURIs(uri1, uri2);
-}
-
-static bool
DefinitelyEqualImages(nsStyleImageRequest* aRequest1,
nsStyleImageRequest* aRequest2)
{
if (aRequest1 == aRequest2) {
return true;
}
if (!aRequest1 || !aRequest2) {