summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/FrameTracker.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'services/surfaceflinger/FrameTracker.cpp')
-rw-r--r--services/surfaceflinger/FrameTracker.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/services/surfaceflinger/FrameTracker.cpp b/services/surfaceflinger/FrameTracker.cpp
index 99c4daaba5..1539873aaa 100644
--- a/services/surfaceflinger/FrameTracker.cpp
+++ b/services/surfaceflinger/FrameTracker.cpp
@@ -82,17 +82,17 @@ void FrameTracker::advanceFrame() {
mFrameRecords[mOffset].frameReadyTime = INT64_MAX;
mFrameRecords[mOffset].actualPresentTime = INT64_MAX;
- if (mFrameRecords[mOffset].frameReadyFence != NULL) {
+ if (mFrameRecords[mOffset].frameReadyFence != nullptr) {
// We're clobbering an unsignaled fence, so we need to decrement the
// fence count.
- mFrameRecords[mOffset].frameReadyFence = NULL;
+ mFrameRecords[mOffset].frameReadyFence = nullptr;
mNumFences--;
}
- if (mFrameRecords[mOffset].actualPresentFence != NULL) {
+ if (mFrameRecords[mOffset].actualPresentFence != nullptr) {
// We're clobbering an unsignaled fence, so we need to decrement the
// fence count.
- mFrameRecords[mOffset].actualPresentFence = NULL;
+ mFrameRecords[mOffset].actualPresentFence = nullptr;
mNumFences--;
}
}
@@ -153,10 +153,10 @@ void FrameTracker::processFencesLocked() const {
bool updated = false;
const std::shared_ptr<FenceTime>& rfence = records[idx].frameReadyFence;
- if (rfence != NULL) {
+ if (rfence != nullptr) {
records[idx].frameReadyTime = rfence->getSignalTime();
if (records[idx].frameReadyTime < INT64_MAX) {
- records[idx].frameReadyFence = NULL;
+ records[idx].frameReadyFence = nullptr;
numFences--;
updated = true;
}
@@ -164,10 +164,10 @@ void FrameTracker::processFencesLocked() const {
const std::shared_ptr<FenceTime>& pfence =
records[idx].actualPresentFence;
- if (pfence != NULL) {
+ if (pfence != nullptr) {
records[idx].actualPresentTime = pfence->getSignalTime();
if (records[idx].actualPresentTime < INT64_MAX) {
- records[idx].actualPresentFence = NULL;
+ records[idx].actualPresentFence = nullptr;
numFences--;
updated = true;
}