зеркало из https://github.com/mozilla/pjs.git
Attempt to fix Tp regression by only doing checking for XTF if the namespace is not one that we support internally.
This commit is contained in:
Родитель
cdbcc064e3
Коммит
c8c7c2864f
|
@ -7584,7 +7584,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||||
|
|
||||||
// XTF
|
// XTF
|
||||||
#ifdef MOZ_XTF
|
#ifdef MOZ_XTF
|
||||||
if (NS_SUCCEEDED(rv) &&
|
if (aNameSpaceID > kNameSpaceID_LastBuiltin &&
|
||||||
|
NS_SUCCEEDED(rv) &&
|
||||||
((nsnull == aFrameItems.childList) ||
|
((nsnull == aFrameItems.childList) ||
|
||||||
(lastChild == aFrameItems.lastChild))) {
|
(lastChild == aFrameItems.lastChild))) {
|
||||||
nsCOMPtr<nsIXTFElementWrapperPrivate> xtfElem = do_QueryInterface(aContent);
|
nsCOMPtr<nsIXTFElementWrapperPrivate> xtfElem = do_QueryInterface(aContent);
|
||||||
|
|
|
@ -7584,7 +7584,8 @@ nsCSSFrameConstructor::ConstructFrameInternal( nsIPresShell* aPresShe
|
||||||
|
|
||||||
// XTF
|
// XTF
|
||||||
#ifdef MOZ_XTF
|
#ifdef MOZ_XTF
|
||||||
if (NS_SUCCEEDED(rv) &&
|
if (aNameSpaceID > kNameSpaceID_LastBuiltin &&
|
||||||
|
NS_SUCCEEDED(rv) &&
|
||||||
((nsnull == aFrameItems.childList) ||
|
((nsnull == aFrameItems.childList) ||
|
||||||
(lastChild == aFrameItems.lastChild))) {
|
(lastChild == aFrameItems.lastChild))) {
|
||||||
nsCOMPtr<nsIXTFElementWrapperPrivate> xtfElem = do_QueryInterface(aContent);
|
nsCOMPtr<nsIXTFElementWrapperPrivate> xtfElem = do_QueryInterface(aContent);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче