Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(223)

Unified Diff: content/browser/compositor/buffer_queue.cc

Issue 1359423002: Disable region copy on ARM since it isn't supported (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comment Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/compositor/buffer_queue.cc
diff --git a/content/browser/compositor/buffer_queue.cc b/content/browser/compositor/buffer_queue.cc
index 4845e57916e9997020048c916e9e142fff305afc..6f4a19dae34a42d5b73e8dbd6480ffe5f53157c5 100644
--- a/content/browser/compositor/buffer_queue.cc
+++ b/content/browser/compositor/buffer_queue.cc
@@ -14,6 +14,7 @@
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkRegion.h"
#include "ui/gfx/gpu_memory_buffer.h"
+#include "ui/gfx/skia_util.h"
namespace content {
@@ -61,12 +62,18 @@ void BufferQueue::CopyBufferDamage(int texture,
int source_texture,
const gfx::Rect& new_damage,
const gfx::Rect& old_damage) {
+ gfx::Rect new_damage_mutable = new_damage;
+ gfx::Rect old_damage_mutable = old_damage;
+#if defined(ARCH_CPU_ARM_FAMILY)
+ // TODO(dnicoara): Remove ARM workaround once partial swap is enabled.
+ new_damage_mutable = gfx::Rect(size_);
+ old_damage_mutable = gfx::Rect();
+#endif
+
gl_helper_->CopySubBufferDamage(
texture_target_, texture, source_texture,
- SkRegion(SkIRect::MakeXYWH(new_damage.x(), new_damage.y(),
- new_damage.width(), new_damage.height())),
- SkRegion(SkIRect::MakeXYWH(old_damage.x(), old_damage.y(),
- old_damage.width(), old_damage.height())));
+ SkRegion(gfx::RectToSkIRect(new_damage_mutable)),
+ SkRegion(gfx::RectToSkIRect(old_damage_mutable)));
}
void BufferQueue::UpdateBufferDamage(const gfx::Rect& damage) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698