diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-03-06 12:30:20 +0100 |
| commit | e25ad543952b5afc13181aaebef9c5951fc27be0 (patch) | |
| tree | 456a1359b3e5f810319edd423dd5cc5a1e22ada5 /layout | |
| parent | 74533a843277c3687c749989ed1522354d1054d2 (diff) | |
| parent | 5dba1ebe8498286762873fff0016f35f3e14d2d5 (diff) | |
| download | UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.gz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.lz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.tar.xz UXP-e25ad543952b5afc13181aaebef9c5951fc27be0.zip | |
Merge branch 'master' into Basilisk-releasev2019.03.08
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/nsLayoutUtils.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index f0341f9ef..07befdc81 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -2681,6 +2681,10 @@ nsLayoutUtils::GetTransformToAncestorScaleExcludingAnimated(nsIFrame* aFrame) nsIFrame* nsLayoutUtils::FindNearestCommonAncestorFrame(nsIFrame* aFrame1, nsIFrame* aFrame2) { + if (!aFrame1 || !aFrame2) { + return nullptr; + } + AutoTArray<nsIFrame*,100> ancestors1; AutoTArray<nsIFrame*,100> ancestors2; nsIFrame* commonAncestor = nullptr; |