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

Backed out changeset 3a8c78a6146f (bug 1283947) for failing browser_animation_pseudo_elements.js on Linux opt without e10s. r=backout

Browse Source
This commit is contained in:
Sebastian Hengst 2017-02-20 22:47:24 +01:00
parent 6908dbb0a6
commit 6c12088216
5 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/layers/TransactionIdAllocator.h
View File

@ -53,15 +53,6 @@ public:
*/
virtual void RevokeTransactionId(uint64_t aTransactionId) = 0;
/**
* Stop waiting for pending transactions, if any.
*
* This is used when ClientLayerManager is assigning to another refresh
* driver, and the current refresh driver may never receive transaction
* completed notifications.
*/
virtual void ClearPendingTransactions() = 0;
/**
* Get the start time of the current refresh tick.
*/

13
gfx/layers/client/ClientLayerManager.cpp
View File

@ -511,19 +511,6 @@ ClientLayerManager::GetCompositorSideAPZTestData(APZTestData* aData) const
}
}
void
ClientLayerManager::SetTransactionIdAllocator(TransactionIdAllocator* aAllocator)
{
// When changing the refresh driver, the previous refresh driver may never
// receive updates of pending transactions it's waiting for. So clear the
// waiting state before assigning another refresh driver.
if (mTransactionIdAllocator) {
mTransactionIdAllocator->ClearPendingTransactions();
}
mTransactionIdAllocator = aAllocator;
}
float
ClientLayerManager::RequestProperty(const nsAString& aProperty)
{

5
gfx/layers/client/ClientLayerManager.h
View File

@ -220,7 +220,10 @@ public:
// Get a copy of the compositor-side APZ test data for our layers ID.
void GetCompositorSideAPZTestData(APZTestData* aData) const;
virtual void SetTransactionIdAllocator(TransactionIdAllocator* aAllocator) override;
virtual void SetTransactionIdAllocator(TransactionIdAllocator* aAllocator) override
{
mTransactionIdAllocator = aAllocator;
}
virtual uint64_t GetLastTransactionId() override { return mLatestTransactionId; }

7
layout/base/nsRefreshDriver.cpp
View File

@ -2185,13 +2185,6 @@ nsRefreshDriver::RevokeTransactionId(uint64_t aTransactionId)
mPendingTransaction--;
}
void
nsRefreshDriver::ClearPendingTransactions()
{
mCompletedTransaction = mPendingTransaction;
mWaitingForTransaction = false;
}
mozilla::TimeStamp
nsRefreshDriver::GetTransactionStart()
{

1
layout/base/nsRefreshDriver.h
View File

@ -309,7 +309,6 @@ public:
uint64_t LastTransactionId() const override;
void NotifyTransactionCompleted(uint64_t aTransactionId) override;
void RevokeTransactionId(uint64_t aTransactionId) override;
void ClearPendingTransactions() override;
mozilla::TimeStamp GetTransactionStart() override;
bool IsWaitingForPaint(mozilla::TimeStamp aTime);