Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1342289) for crashtest leaks a=backout

Browse Source 
Backed out changeset 3744676f7923 (bug 1342289)
Backed out changeset d0a029765f69 (bug 1342289)

MozReview-Commit-ID: Fb6GfKo6AhJ

--HG--
extra : rebase_source : 8ac1045485a4f3b0aa94b01103933814ff89e23a
This commit is contained in:
Wes Kocher 2017-05-22 12:50:23 -07:00
parent 33f3641255
commit c23cbd4a57
3 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/html/crashtests/crashtests.list
View File

@ -55,7 +55,7 @@ load 741218.json
load 741250.xhtml
load 795221-1.html
load 795221-2.html
load 795221-3.html
skip-if(stylo) load 795221-3.html # bug 1342289
load 795221-4.html
load 795221-5.xml
load 811226.html

6
layout/style/ServoStyleSheet.cpp
View File

@ -15,9 +15,7 @@
#include "mozilla/dom/CSSRuleList.h"
#include "mozilla/dom/MediaList.h"
#include "mozAutoDocUpdate.h"
#include "nsIDOMCSSStyleSheet.h"
using namespace mozilla::dom;
@ -73,10 +71,6 @@ ServoStyleSheet::~ServoStyleSheet()
// QueryInterface implementation for ServoStyleSheet
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(ServoStyleSheet)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMCSSStyleSheet)
if (aIID.Equals(NS_GET_IID(ServoStyleSheet)))
foundInterface = reinterpret_cast<nsISupports*>(this);
else
NS_INTERFACE_MAP_END_INHERITING(StyleSheet)
NS_IMPL_ADDREF_INHERITED(ServoStyleSheet, StyleSheet)

12
layout/style/ServoStyleSheet.h
View File

@ -50,14 +50,6 @@ struct ServoStyleSheetInner : public StyleSheetInfo
/**
* CSS style sheet object that is a wrapper for a Servo Stylesheet.
*/
// CID for the ServoStyleSheet class
// a6f31472-ab69-4beb-860f-c221431ead77
#define NS_SERVO_STYLE_SHEET_IMPL_CID \
{ 0xa6f31472, 0xab69, 0x4beb, \
{ 0x86, 0x0f, 0xc2, 0x21, 0x43, 0x1e, 0xad, 0x77 } }
class ServoStyleSheet : public StyleSheet
{
public:
@ -69,8 +61,6 @@ public:
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(ServoStyleSheet, StyleSheet)
NS_DECLARE_STATIC_IID_ACCESSOR(NS_SERVO_STYLE_SHEET_IMPL_CID)
bool HasRules() const;
MOZ_MUST_USE nsresult ParseSheet(css::Loader* aLoader,
@ -153,8 +143,6 @@ private:
friend class StyleSheet;
};
NS_DEFINE_STATIC_IID_ACCESSOR(ServoStyleSheet, NS_SERVO_STYLE_SHEET_IMPL_CID)
} // namespace mozilla
#endif // mozilla_ServoStyleSheet_h