Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 553d7f3d8eed (bug 1537967) for Marionette failures in testing/firefox-ui/tests/functional/security/test_mixed_content_page.py

Browse Source
This commit is contained in:
Dorel Luca 2019-04-11 06:31:36 +03:00
parent 9dee2518ef
commit d285466535
4 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/layers/ipc/CompositorVsyncScheduler.cpp
View File

@ -176,13 +176,7 @@ bool CompositorVsyncScheduler::NotifyVsync(const VsyncEvent& aVsync) {
MOZ_ASSERT_IF(XRE_GetProcessType() == GeckoProcessType_GPU,
CompositorThreadHolder::IsInCompositorThread());
MOZ_ASSERT(!NS_IsMainThread());
#if defined(MOZ_WIDGET_ANDROID)
gfx::VRManager* vm = gfx::VRManager::Get();
if (!vm->IsPresenting()) {
PostCompositeTask(aVsync.mId, aVsync.mTime);
}
#endif // defined(MOZ_WIDGET_ANDROID)
PostCompositeTask(aVsync.mId, aVsync.mTime);
PostVRTask(aVsync.mTime);
return true;
}

10
gfx/vr/VRManager.cpp
View File

@ -795,15 +795,5 @@ void VRManager::StopVRNavigation(const uint32_t& aDisplayID,
}
}
bool VRManager::IsPresenting() {
for (const auto& manager : mManagers) {
if (manager->GetIsPresenting()) {
return true;
}
}
return false;
}
} // namespace gfx
} // namespace mozilla

1
gfx/vr/VRManager.h
View File

@ -68,7 +68,6 @@ class VRManager {
const TimeDuration& aTimeout);
void Shutdown();
bool IsPresenting();
protected:
VRManager();

12
layout/base/nsRefreshDriver.cpp
View File

@ -76,10 +76,6 @@
#include "nsDisplayList.h"
#include "nsTransitionManager.h"
#if defined(MOZ_WIDGET_ANDROID)
# include "VRManager.h"
#endif // defined(MOZ_WIDGET_ANDROID)
#ifdef MOZ_XUL
# include "nsXULPopupManager.h"
#endif
@ -1751,14 +1747,6 @@ void nsRefreshDriver::Tick(VsyncId aId, TimeStamp aNowTime) {
return;
}
#if defined(MOZ_WIDGET_ANDROID)
gfx::VRManager* vm = gfx::VRManager::Get();
if (vm->IsPresenting()) {
RunFrameRequestCallbacks(aNowTime);
return;
}
#endif // defined(MOZ_WIDGET_ANDROID)
AUTO_PROFILER_LABEL("nsRefreshDriver::Tick", LAYOUT);
// We're either frozen or we were disconnected (likely in the middle