0

PDF: Use base::AutoReset in PaintManager.

Automatically reset the |in_paint_| boolean when DoPaint() finishes,
instead of doing it manually.

Change-Id: I6049a728f05a691a36ece682062d8a149c4a062b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2154232
Reviewed-by: Daniel Hosseinian <dhoss@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760165}
This commit is contained in:
Lei Zhang
2020-04-17 19:20:53 +00:00
committed by Commit Bot
parent 53c61a4eb5
commit dd0bac983c

@ -9,6 +9,7 @@
#include <algorithm> #include <algorithm>
#include "base/auto_reset.h"
#include "base/logging.h" #include "base/logging.h"
#include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_errors.h"
#include "ppapi/cpp/instance.h" #include "ppapi/cpp/instance.h"
@ -193,7 +194,7 @@ void PaintManager::EnsureCallbackPending() {
} }
void PaintManager::DoPaint() { void PaintManager::DoPaint() {
in_paint_ = true; base::AutoReset<bool> auto_reset_in_paint(&in_paint_, true);
std::vector<ReadyRect> ready_rects; std::vector<ReadyRect> ready_rects;
std::vector<pp::Rect> pending_rects; std::vector<pp::Rect> pending_rects;
@ -234,10 +235,8 @@ void PaintManager::DoPaint() {
PaintAggregator::PaintUpdate update = aggregator_.GetPendingUpdate(); PaintAggregator::PaintUpdate update = aggregator_.GetPendingUpdate();
client_->OnPaint(update.paint_rects, &ready_rects, &pending_rects); client_->OnPaint(update.paint_rects, &ready_rects, &pending_rects);
if (ready_rects.empty() && pending_rects.empty()) { if (ready_rects.empty() && pending_rects.empty())
in_paint_ = false;
return; // Nothing was painted, don't schedule a flush. return; // Nothing was painted, don't schedule a flush.
}
std::vector<PaintAggregator::ReadyRect> ready_now; std::vector<PaintAggregator::ReadyRect> ready_now;
if (pending_rects.empty()) { if (pending_rects.empty()) {
@ -272,7 +271,6 @@ void PaintManager::DoPaint() {
aggregator_.SetIntermediateResults(ready_later, pending_rects); aggregator_.SetIntermediateResults(ready_later, pending_rects);
if (ready_now.empty()) { if (ready_now.empty()) {
in_paint_ = false;
EnsureCallbackPending(); EnsureCallbackPending();
return; return;
} }
@ -285,7 +283,6 @@ void PaintManager::DoPaint() {
Flush(); Flush();
in_paint_ = false;
first_paint_ = false; first_paint_ = false;
if (graphics_need_to_be_bound_) { if (graphics_need_to_be_bound_) {