summaryrefslogtreecommitdiffstats
path: root/dom/base
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:07:20 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-29 12:07:20 +0200
commit7ee501103ad2efe1d28ef3c10b4111a685746c06 (patch)
tree11a8b24d352d2a457b6c3a060c2c3d338391093c /dom/base
parentde9560af3e0e0d0dc93c5401c9b6ca2f0a173e36 (diff)
downloadUXP-7ee501103ad2efe1d28ef3c10b4111a685746c06.tar
UXP-7ee501103ad2efe1d28ef3c10b4111a685746c06.tar.gz
UXP-7ee501103ad2efe1d28ef3c10b4111a685746c06.tar.lz
UXP-7ee501103ad2efe1d28ef3c10b4111a685746c06.tar.xz
UXP-7ee501103ad2efe1d28ef3c10b4111a685746c06.zip
Bug 1322966 - Cleanup performance.cpp
https://hg.mozilla.org/mozilla-central/rev/0ad76084c4c3
Diffstat (limited to 'dom/base')
-rw-r--r--dom/base/nsGlobalWindow.cpp20
1 files changed, 2 insertions, 18 deletions
diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp
index 3d5c44a78..738703ef1 100644
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -3124,8 +3124,7 @@ nsGlobalWindow::SetNewDocument(nsIDocument* aDocument,
newInnerWindow->mPerformance =
Performance::CreateForMainThread(newInnerWindow->AsInner(),
currentInner->mPerformance->GetDOMTiming(),
- currentInner->mPerformance->GetChannel(),
- currentInner->mPerformance->GetParentPerformance());
+ currentInner->mPerformance->GetChannel());
}
}
@@ -4339,22 +4338,7 @@ nsPIDOMWindowInner::CreatePerformanceObjectIfNeeded()
timedChannel = nullptr;
}
if (timing) {
- // If we are dealing with an iframe, we will need the parent's performance
- // object (so we can add the iframe as a resource of that page).
- Performance* parentPerformance = nullptr;
- nsCOMPtr<nsPIDOMWindowOuter> parentWindow = GetScriptableParentOrNull();
- if (parentWindow) {
- nsPIDOMWindowInner* parentInnerWindow = nullptr;
- if (parentWindow) {
- parentInnerWindow = parentWindow->GetCurrentInnerWindow();
- }
- if (parentInnerWindow) {
- parentPerformance = parentInnerWindow->GetPerformance();
- }
- }
- mPerformance =
- Performance::CreateForMainThread(this, timing, timedChannel,
- parentPerformance);
+ mPerformance = Performance::CreateForMainThread(this, timing, timedChannel);
}
}