wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 9b63189605b8 (bug 911889)

Browse Source
This commit is contained in:
Ed Morley 2013-11-01 12:35:00 +00:00
parent 18a0626fd1
commit 83e36d814d
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
layout/base/nsRefreshDriver.cpp
View File

@ -26,7 +26,7 @@
#endif #endif
#include "mozilla/Util.h" #include "mozilla/Util.h"
#include "mozilla/AutoRestore.h"
#include "nsRefreshDriver.h" #include "nsRefreshDriver.h"
#include "nsITimer.h" #include "nsITimer.h"
#include "nsLayoutUtils.h" #include "nsLayoutUtils.h"
@ -685,8 +685,7 @@ nsRefreshDriver::nsRefreshDriver(nsPresContext* aPresContext)
mThrottled(false), mThrottled(false),
mTestControllingRefreshes(false), mTestControllingRefreshes(false),
mViewManagerFlushIsPending(false), mViewManagerFlushIsPending(false),
mRequestedHighPrecision(false), mRequestedHighPrecision(false)
mInRefresh(false)
{ {
mMostRecentRefreshEpochTime = JS_Now(); mMostRecentRefreshEpochTime = JS_Now();
mMostRecentRefresh = TimeStamp::Now(); mMostRecentRefresh = TimeStamp::Now();
@ -1062,9 +1061,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
profiler_tracing("Paint", "RD", TRACING_INTERVAL_START); profiler_tracing("Paint", "RD", TRACING_INTERVAL_START);
AutoRestore<bool> restoreInRefresh(mInRefresh);
mInRefresh = true;
/* /*
* The timer holds a reference to |this| while calling |Notify|. * The timer holds a reference to |this| while calling |Notify|.
* However, implementations of |WillRefresh| are permitted to destroy * However, implementations of |WillRefresh| are permitted to destroy
@ -1224,8 +1220,6 @@ nsRefreshDriver::Tick(int64_t aNowEpoch, TimeStamp aNowTime)
mPostRefreshObservers[i]->DidRefresh(); mPostRefreshObservers[i]->DidRefresh();
} }
profiler_tracing("Paint", "RD", TRACING_INTERVAL_END); profiler_tracing("Paint", "RD", TRACING_INTERVAL_END);
NS_ASSERTION(mInRefresh, "Still in refresh");
} }
/* static */ PLDHashOperator /* static */ PLDHashOperator

3
layout/base/nsRefreshDriver.h
View File

@ -249,8 +249,6 @@ public:
*/ */
static int32_t DefaultInterval(); static int32_t DefaultInterval();
bool IsInRefresh() { return mInRefresh; }
private: private:
typedef nsTObserverArray<nsARefreshObserver*> ObserverArray; typedef nsTObserverArray<nsARefreshObserver*> ObserverArray;
typedef nsTHashtable<nsISupportsHashKey> RequestTable; typedef nsTHashtable<nsISupportsHashKey> RequestTable;
@ -304,7 +302,6 @@ private:
bool mTestControllingRefreshes; bool mTestControllingRefreshes;
bool mViewManagerFlushIsPending; bool mViewManagerFlushIsPending;
bool mRequestedHighPrecision; bool mRequestedHighPrecision;
bool mInRefresh;
int64_t mMostRecentRefreshEpochTime; int64_t mMostRecentRefreshEpochTime;
mozilla::TimeStamp mMostRecentRefresh; mozilla::TimeStamp mMostRecentRefresh;