nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1441009: Don't null-check OwnerDoc. r=smaug

Browse source 
Can't return null.

MozReview-Commit-ID: JzcNwmsCxIu
This commit is contained in:
Emilio Cobos Álvarez 2018-02-25 16:44:51 +01:00
parent d6a3786a64
commit 0ad7abf15e
5 changed files with 12 additions and 12 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
dom/base/FragmentOrElement.cpp
View file

@ -1024,8 +1024,7 @@ nsIContent::GetEventTargetParent(EventChainPreVisitor& aVisitor)
} }
if (!aVisitor.mEvent->mFlags.mComposedInNativeAnonymousContent && if (!aVisitor.mEvent->mFlags.mComposedInNativeAnonymousContent &&
IsRootOfNativeAnonymousSubtree() && OwnerDoc() && IsRootOfNativeAnonymousSubtree() && OwnerDoc()->GetWindow()) {
OwnerDoc()->GetWindow()) {
aVisitor.SetParentTarget(OwnerDoc()->GetWindow()->GetParentTarget(), true); aVisitor.SetParentTarget(OwnerDoc()->GetWindow()->GetParentTarget(), true);
} else if (parent) { } else if (parent) {
aVisitor.SetParentTarget(parent, false); aVisitor.SetParentTarget(parent, false);

13
dom/canvas/CanvasRenderingContext2D.cpp
View file

@ -1861,7 +1861,7 @@ CanvasRenderingContext2D::RegisterAllocation()
static already_AddRefed<LayerManager> static already_AddRefed<LayerManager>
LayerManagerFromCanvasElement(nsINode* aCanvasElement) LayerManagerFromCanvasElement(nsINode* aCanvasElement)
{ {
if (!aCanvasElement || !aCanvasElement->OwnerDoc()) { if (!aCanvasElement) {
return nullptr; return nullptr;
} }
@ -1926,7 +1926,7 @@ CanvasRenderingContext2D::TrySharedTarget(RefPtr<gfx::DrawTarget>& aOutDT,
aOutDT = nullptr; aOutDT = nullptr;
aOutProvider = nullptr; aOutProvider = nullptr;
if (!mCanvasElement || !mCanvasElement->OwnerDoc()) { if (!mCanvasElement) {
return false; return false;
} }
@ -4967,9 +4967,10 @@ CanvasRenderingContext2D::IsPointInPath(JSContext* aCx, double aX, double aY, co
// Check for site-specific permission and return false if no permission. // Check for site-specific permission and return false if no permission.
if (mCanvasElement) { if (mCanvasElement) {
nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc();
if (!ownerDoc || !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx)) if (!CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx)) {
return false; return false;
} }
}
EnsureUserSpacePath(aWinding); EnsureUserSpacePath(aWinding);
if (!mPath) { if (!mPath) {
@ -5009,9 +5010,10 @@ CanvasRenderingContext2D::IsPointInStroke(JSContext* aCx, double aX, double aY)
// Check for site-specific permission and return false if no permission. // Check for site-specific permission and return false if no permission.
if (mCanvasElement) { if (mCanvasElement) {
nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc();
if (!ownerDoc || !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx)) if (!CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx)) {
return false; return false;
} }
}
EnsureUserSpacePath(); EnsureUserSpacePath();
if (!mPath) { if (!mPath) {
@ -5878,8 +5880,7 @@ CanvasRenderingContext2D::GetImageDataArray(JSContext* aCx,
bool usePlaceholder = false; bool usePlaceholder = false;
if (mCanvasElement) { if (mCanvasElement) {
nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc(); nsCOMPtr<nsIDocument> ownerDoc = mCanvasElement->OwnerDoc();
usePlaceholder = !ownerDoc || usePlaceholder = !CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx);
!CanvasUtils::IsImageExtractionAllowed(ownerDoc, aCx);
} }
do { do {

2
dom/ipc/TabParent.cpp
View file

@ -316,7 +316,7 @@ TabParent::SetOwnerElement(Element* aElement)
void void
TabParent::AddWindowListeners() TabParent::AddWindowListeners()
{ {
if (mFrameElement && mFrameElement->OwnerDoc()) { if (mFrameElement) {
if (nsCOMPtr<nsPIDOMWindowOuter> window = mFrameElement->OwnerDoc()->GetWindow()) { if (nsCOMPtr<nsPIDOMWindowOuter> window = mFrameElement->OwnerDoc()->GetWindow()) {
nsCOMPtr<EventTarget> eventTarget = window->GetTopWindowRoot(); nsCOMPtr<EventTarget> eventTarget = window->GetTopWindowRoot();
if (eventTarget) { if (eventTarget) {

4
dom/plugins/base/nsPluginInstanceOwner.cpp
View file

@ -497,7 +497,7 @@ NS_IMETHODIMP nsPluginInstanceOwner::GetDocument(nsIDocument* *aDocument)
// XXX sXBL/XBL2 issue: current doc or owner doc? // XXX sXBL/XBL2 issue: current doc or owner doc?
// But keep in mind bug 322414 comment 33 // But keep in mind bug 322414 comment 33
NS_IF_ADDREF(*aDocument = content->OwnerDoc()); NS_ADDREF(*aDocument = content->OwnerDoc());
return NS_OK; return NS_OK;
} }
@ -3292,7 +3292,7 @@ void nsPluginInstanceOwner::SetFrame(nsPluginFrame *aFrame)
} }
// Register for widget-focus events on the window root. // Register for widget-focus events on the window root.
if (content && content->OwnerDoc() && content->OwnerDoc()->GetWindow()) { if (content && content->OwnerDoc()->GetWindow()) {
nsCOMPtr<EventTarget> windowRoot = content->OwnerDoc()->GetWindow()->GetTopWindowRoot(); nsCOMPtr<EventTarget> windowRoot = content->OwnerDoc()->GetWindow()->GetTopWindowRoot();
if (windowRoot) { if (windowRoot) {
windowRoot->AddEventListener(NS_LITERAL_STRING("activate"), windowRoot->AddEventListener(NS_LITERAL_STRING("activate"),

2
dom/svg/SVGViewportElement.h
View file

@ -147,7 +147,7 @@ protected:
bool IsRoot() const { bool IsRoot() const {
NS_ASSERTION((IsInUncomposedDoc() && !GetParent()) == NS_ASSERTION((IsInUncomposedDoc() && !GetParent()) ==
(OwnerDoc() && (OwnerDoc()->GetRootElement() == this)), (OwnerDoc()->GetRootElement() == this),
"Can't determine if we're root"); "Can't determine if we're root");
return IsInUncomposedDoc() && !GetParent(); return IsInUncomposedDoc() && !GetParent();
} }