Date: Mon, 23 Feb 2015 22:44:53 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1818 - in trunk/www/libxul: . files Message-ID: <201502232244.t1NMirHn008620@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Mon Feb 23 22:44:53 2015
New Revision: 1818
Log:
update
Deleted:
trunk/www/libxul/files/patch-bug1083461
Modified:
trunk/www/libxul/Makefile
trunk/www/libxul/distinfo
Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Mon Feb 23 22:40:24 2015 (r1817)
+++ trunk/www/libxul/Makefile Mon Feb 23 22:44:53 2015 (r1818)
@@ -2,8 +2,7 @@
# $FreeBSD: head/www/libxul/Makefile 378529 2015-02-06 12:08:43Z jbeich $
PORTNAME= libxul
-DISTVERSION= 31.4.0
-PORTREVISION= 2
+DISTVERSION= 31.5.0
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
DISTNAME= firefox-${DISTVERSION}esr.source
Modified: trunk/www/libxul/distinfo
==============================================================================
--- trunk/www/libxul/distinfo Mon Feb 23 22:40:24 2015 (r1817)
+++ trunk/www/libxul/distinfo Mon Feb 23 22:44:53 2015 (r1818)
@@ -1,2 +1,2 @@
-SHA256 (firefox-31.4.0esr.source.tar.bz2) = c5ad8b588fb1e7690be5da04f627335f6440277dac4bccd46e6687fcf2fbc23b
-SIZE (firefox-31.4.0esr.source.tar.bz2) = 147935703
+SHA256 (firefox-31.5.0esr.source.tar.bz2) = b746d62313d4d960e05a8e18a25960eba162fe0620af7b3cb5963284e2b9dc45
+SIZE (firefox-31.5.0esr.source.tar.bz2) = 369024991
Deleted: trunk/www/libxul/files/patch-bug1083461
==============================================================================
--- trunk/www/libxul/files/patch-bug1083461 Mon Feb 23 22:44:53 2015 (r1817)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,156 +0,0 @@
-commit c97894b
-Author: L. David Baron <dbaron@dbaron.org>
-Date: Sun Oct 19 23:31:39 2014 -0400
-
- Bug 1083461 - Convert nsCSSValue{,Pair}List::operator== back to a static Equal method so that it can be validly called on null pointers. r=bzbarsky approval-mozilla-esr31=bkerensa
----
- layout/style/nsCSSValue.cpp | 28 ++++++++++++++++------------
- layout/style/nsCSSValue.h | 22 ++++++++++++++++------
- layout/style/nsStyleAnimation.cpp | 6 ++++--
- 3 files changed, 36 insertions(+), 20 deletions(-)
-
-diff --git layout/style/nsCSSValue.cpp layout/style/nsCSSValue.cpp
-index 781ef65..4bbc979 100644
---- layout/style/nsCSSValue.cpp
-+++ layout/style/nsCSSValue.cpp
-@@ -253,13 +253,14 @@ bool nsCSSValue::operator==(const nsCSSValue& aOther) const
- return *mValue.mRect == *aOther.mValue.mRect;
- }
- else if (eCSSUnit_List == mUnit) {
-- return *mValue.mList == *aOther.mValue.mList;
-+ return nsCSSValueList::Equal(mValue.mList, aOther.mValue.mList);
- }
- else if (eCSSUnit_SharedList == mUnit) {
- return *mValue.mSharedList == *aOther.mValue.mSharedList;
- }
- else if (eCSSUnit_PairList == mUnit) {
-- return *mValue.mPairList == *aOther.mValue.mPairList;
-+ return nsCSSValuePairList::Equal(mValue.mPairList,
-+ aOther.mValue.mPairList);
- }
- else if (eCSSUnit_GridTemplateAreas == mUnit) {
- return *mValue.mGridTemplateAreas == *aOther.mValue.mGridTemplateAreas;
-@@ -1740,13 +1741,15 @@ nsCSSValueList::AppendToString(nsCSSProperty aProperty, nsAString& aResult,
- }
- }
-
--bool
--nsCSSValueList::operator==(const nsCSSValueList& aOther) const
-+/* static */ bool
-+nsCSSValueList::Equal(const nsCSSValueList* aList1,
-+ const nsCSSValueList* aList2)
- {
-- if (this == &aOther)
-+ if (aList1 == aList2) {
- return true;
-+ }
-
-- const nsCSSValueList *p1 = this, *p2 = &aOther;
-+ const nsCSSValueList *p1 = aList1, *p2 = aList2;
- for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
- if (p1->mValue != p2->mValue)
- return false;
-@@ -1799,8 +1802,7 @@ nsCSSValueSharedList::AppendToString(nsCSSProperty aProperty, nsAString& aResult
- bool
- nsCSSValueSharedList::operator==(const nsCSSValueSharedList& aOther) const
- {
-- return !mHead == !aOther.mHead &&
-- (!mHead || *mHead == *aOther.mHead);
-+ return nsCSSValueList::Equal(mHead, aOther.mHead);
- }
-
- size_t
-@@ -2010,13 +2012,15 @@ nsCSSValuePairList::AppendToString(nsCSSProperty aProperty,
- }
- }
-
--bool
--nsCSSValuePairList::operator==(const nsCSSValuePairList& aOther) const
-+/* static */ bool
-+nsCSSValuePairList::Equal(const nsCSSValuePairList* aList1,
-+ const nsCSSValuePairList* aList2)
- {
-- if (this == &aOther)
-+ if (aList1 == aList2) {
- return true;
-+ }
-
-- const nsCSSValuePairList *p1 = this, *p2 = &aOther;
-+ const nsCSSValuePairList *p1 = aList1, *p2 = aList2;
- for ( ; p1 && p2; p1 = p1->mNext, p2 = p2->mNext) {
- if (p1->mXValue != p2->mXValue ||
- p1->mYValue != p2->mYValue)
-diff --git layout/style/nsCSSValue.h layout/style/nsCSSValue.h
-index 753938c..77eeef0 100644
---- layout/style/nsCSSValue.h
-+++ layout/style/nsCSSValue.h
-@@ -806,9 +806,8 @@ struct nsCSSValueList {
- void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
- nsCSSValue::Serialization aValueSerialization) const;
-
-- bool operator==(nsCSSValueList const& aOther) const;
-- bool operator!=(const nsCSSValueList& aOther) const
-- { return !(*this == aOther); }
-+ static bool Equal(const nsCSSValueList* aList1,
-+ const nsCSSValueList* aList2);
-
- size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
-
-@@ -821,6 +820,12 @@ private:
- {
- MOZ_COUNT_CTOR(nsCSSValueList);
- }
-+
-+ // We don't want operator== or operator!= because they wouldn't be
-+ // null-safe, which is generally what we need. Use |Equal| method
-+ // above instead.
-+ bool operator==(nsCSSValueList const& aOther) const MOZ_DELETE;
-+ bool operator!=(const nsCSSValueList& aOther) const MOZ_DELETE;
- };
-
- // nsCSSValueList_heap differs from nsCSSValueList only in being
-@@ -1199,9 +1204,8 @@ struct nsCSSValuePairList {
- void AppendToString(nsCSSProperty aProperty, nsAString& aResult,
- nsCSSValue::Serialization aValueSerialization) const;
-
-- bool operator==(const nsCSSValuePairList& aOther) const;
-- bool operator!=(const nsCSSValuePairList& aOther) const
-- { return !(*this == aOther); }
-+ static bool Equal(const nsCSSValuePairList* aList1,
-+ const nsCSSValuePairList* aList2);
-
- size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;
-
-@@ -1215,6 +1219,12 @@ private:
- {
- MOZ_COUNT_CTOR(nsCSSValuePairList);
- }
-+
-+ // We don't want operator== or operator!= because they wouldn't be
-+ // null-safe, which is generally what we need. Use |Equal| method
-+ // above instead.
-+ bool operator==(const nsCSSValuePairList& aOther) const MOZ_DELETE;
-+ bool operator!=(const nsCSSValuePairList& aOther) const MOZ_DELETE;
- };
-
- // nsCSSValuePairList_heap differs from nsCSSValuePairList only in being
-diff --git layout/style/nsStyleAnimation.cpp layout/style/nsStyleAnimation.cpp
-index 6c2ccb0..8dbe404 100644
---- layout/style/nsStyleAnimation.cpp
-+++ layout/style/nsStyleAnimation.cpp
-@@ -3816,11 +3816,13 @@ nsStyleAnimation::Value::operator==(const Value& aOther) const
- case eUnit_Filter:
- case eUnit_Shadow:
- case eUnit_BackgroundPosition:
-- return *mValue.mCSSValueList == *aOther.mValue.mCSSValueList;
-+ return nsCSSValueList::Equal(mValue.mCSSValueList,
-+ aOther.mValue.mCSSValueList);
- case eUnit_Transform:
- return *mValue.mCSSValueSharedList == *aOther.mValue.mCSSValueSharedList;
- case eUnit_CSSValuePairList:
-- return *mValue.mCSSValuePairList == *aOther.mValue.mCSSValuePairList;
-+ return nsCSSValuePairList::Equal(mValue.mCSSValuePairList,
-+ aOther.mValue.mCSSValuePairList);
- case eUnit_UnparsedString:
- return (NS_strcmp(GetStringBufferValue(),
- aOther.GetStringBufferValue()) == 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502232244.t1NMirHn008620>