Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-02 06:22:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Handle two-':' forms of pseudo-elts. Bug 128482, r=caillon, sr=jst

Browse Source
This commit is contained in:
bzbarsky%mit.edu 2004-01-17 20:04:26 +00:00
parent 1e8f67c135
commit 498627aad7
2 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
content/html/style/src/nsComputedDOMStyle.cpp
View File

@ -58,6 +58,8 @@
#include "nsIPresContext.h" #include "nsIPresContext.h"
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsCSSPseudoElements.h"
#if defined(DEBUG_bzbarsky) || defined(DEBUG_caillon) #if defined(DEBUG_bzbarsky) || defined(DEBUG_caillon)
#define DEBUG_ComputedDOMStyle #define DEBUG_ComputedDOMStyle
#endif #endif
@ -163,9 +165,29 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement,
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
if (!DOMStringIsNull(aPseudoElt) && !aPseudoElt.IsEmpty()) { if (!DOMStringIsNull(aPseudoElt) && !aPseudoElt.IsEmpty() &&
mPseudo = do_GetAtom(aPseudoElt); aPseudoElt.First() == PRUnichar(':')) {
// deal with two-colon forms of aPseudoElt
nsAString::const_iterator start, end;
aPseudoElt.BeginReading(start);
aPseudoElt.EndReading(end);
NS_ASSERTION(start != end, "aPseudoElt is not empty!");
++start;
PRBool haveTwoColons = PR_TRUE;
if (start == end || *start != PRUnichar(':')) {
--start;
haveTwoColons = PR_FALSE;
}
mPseudo = do_GetAtom(Substring(start, end));
NS_ENSURE_TRUE(mPseudo, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(mPseudo, NS_ERROR_OUT_OF_MEMORY);
// There aren't any non-CSS2 pseudo-elements with a single ':'
if (!haveTwoColons &&
!nsCSSPseudoElements::IsCSS2PseudoElement(mPseudo)) {
// XXXbz I'd really rather we threw an exception or something, but
// the DOM spec sucks.
mPseudo = nsnull;
}
} }
nsCOMPtr<nsIPresContext> presCtx; nsCOMPtr<nsIPresContext> presCtx;

26
layout/style/nsComputedDOMStyle.cpp
View File

@ -58,6 +58,8 @@
#include "nsIPresContext.h" #include "nsIPresContext.h"
#include "nsIDocument.h" #include "nsIDocument.h"
#include "nsCSSPseudoElements.h"
#if defined(DEBUG_bzbarsky) || defined(DEBUG_caillon) #if defined(DEBUG_bzbarsky) || defined(DEBUG_caillon)
#define DEBUG_ComputedDOMStyle #define DEBUG_ComputedDOMStyle
#endif #endif
@ -163,9 +165,29 @@ nsComputedDOMStyle::Init(nsIDOMElement *aElement,
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
} }
if (!DOMStringIsNull(aPseudoElt) && !aPseudoElt.IsEmpty()) { if (!DOMStringIsNull(aPseudoElt) && !aPseudoElt.IsEmpty() &&
mPseudo = do_GetAtom(aPseudoElt); aPseudoElt.First() == PRUnichar(':')) {
// deal with two-colon forms of aPseudoElt
nsAString::const_iterator start, end;
aPseudoElt.BeginReading(start);
aPseudoElt.EndReading(end);
NS_ASSERTION(start != end, "aPseudoElt is not empty!");
++start;
PRBool haveTwoColons = PR_TRUE;
if (start == end || *start != PRUnichar(':')) {
--start;
haveTwoColons = PR_FALSE;
}
mPseudo = do_GetAtom(Substring(start, end));
NS_ENSURE_TRUE(mPseudo, NS_ERROR_OUT_OF_MEMORY); NS_ENSURE_TRUE(mPseudo, NS_ERROR_OUT_OF_MEMORY);
// There aren't any non-CSS2 pseudo-elements with a single ':'
if (!haveTwoColons &&
!nsCSSPseudoElements::IsCSS2PseudoElement(mPseudo)) {
// XXXbz I'd really rather we threw an exception or something, but
// the DOM spec sucks.
mPseudo = nsnull;
}
} }
nsCOMPtr<nsIPresContext> presCtx; nsCOMPtr<nsIPresContext> presCtx;