diff options
author | oshima <oshima@chromium.org> | 2015-01-28 15:20:07 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-28 23:21:04 +0000 |
commit | 6302d690c0b3aa762b92300564d9313876c6a2bf (patch) | |
tree | b0c428a3d9f16f0a7c0f166fa5755e07747ced27 /ui/compositor | |
parent | 1737fefb92ae7152ad6eeffb25919fcd6fd5e13a (diff) | |
download | chromium_src-6302d690c0b3aa762b92300564d9313876c6a2bf.zip chromium_src-6302d690c0b3aa762b92300564d9313876c6a2bf.tar.gz chromium_src-6302d690c0b3aa762b92300564d9313876c6a2bf.tar.bz2 |
This reverts two CLs
"compositor: Fix texture flipping for SW mirroring with surfaceless"
and
"Exclude reflector_impl_unittest.cc from GN non-Aura, non-Mac builds."
Reason for revert:
The original patch breaks software mirroring mode on at least veyron_jerry,
and quite possibly all non-freon systems.
>Original issue's descriptions:
> Exclude reflector_impl_unittest.cc from GN non-Aura, non-Mac builds.
> This fixes the GN build on Android after https://codereview.chromium.org/846063002.
>
> (The GYP build didn't break because content/browser/compositor/ is completely excluded there; see https://code.google.com/p/chromium/codesearch#chromium/src/content/content_tests.gypi&sq=package:chromium&&type=cs&l=1099)
>
> TBR=bauerb@chromium.org
>
> Review URL: https://codereview.chromium.org/879543002
>
> Cr-Commit-Position: refs/heads/master@{#313074}
> compositor: Fix texture flipping for SW mirroring with surfaceless
>
> Ozone-surfaceless renders the scene flipped, so the texture contents are
> inverted from what they should be. This fixes the mirroring logic to
> un-flip the texture when needed, and also to send the right sub-buffer
> update rect.
>
> BUG=434115
>
> Committed: https://crrev.com/c6a481fe79e0c4851a576495105edf2600bfe5be
> Cr-Commit-Position: refs/heads/master@{#312979}
TBR=danakj@chromium.org,achaulk@chromium.org,bauerb@chromium.org
BUG=434115,451804
Review URL: https://codereview.chromium.org/865673003
Cr-Commit-Position: refs/heads/master@{#313610}
Diffstat (limited to 'ui/compositor')
-rw-r--r-- | ui/compositor/BUILD.gn | 1 | ||||
-rw-r--r-- | ui/compositor/compositor.gyp | 1 | ||||
-rw-r--r-- | ui/compositor/layer.cc | 10 | ||||
-rw-r--r-- | ui/compositor/layer.h | 2 | ||||
-rw-r--r-- | ui/compositor/reflector.cc | 18 | ||||
-rw-r--r-- | ui/compositor/reflector.h | 10 |
6 files changed, 4 insertions, 38 deletions
diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn index 6436712..fb527e7 100644 --- a/ui/compositor/BUILD.gn +++ b/ui/compositor/BUILD.gn @@ -43,7 +43,6 @@ component("compositor") { "layer_tree_owner.cc", "layer_tree_owner.h", "layer_type.h", - "reflector.cc", "reflector.h", "scoped_animation_duration_scale_mode.cc", "scoped_animation_duration_scale_mode.h", diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp index 796fb40..59ba997 100644 --- a/ui/compositor/compositor.gyp +++ b/ui/compositor/compositor.gyp @@ -61,7 +61,6 @@ 'layer_tree_owner.cc', 'layer_tree_owner.h', 'layer_type.h', - 'reflector.cc', 'reflector.h', 'scoped_animation_duration_scale_mode.cc', 'scoped_animation_duration_scale_mode.h', diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc index c5de632..a03d6ff 100644 --- a/ui/compositor/layer.cc +++ b/ui/compositor/layer.cc @@ -557,16 +557,6 @@ void Layer::SetTextureSize(gfx::Size texture_size_in_dip) { texture_layer_->SetNeedsDisplay(); } -void Layer::SetTextureFlipped(bool flipped) { - DCHECK(texture_layer_.get()); - texture_layer_->SetFlipped(flipped); -} - -bool Layer::TextureFlipped() const { - DCHECK(texture_layer_.get()); - return texture_layer_->flipped(); -} - void Layer::SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider, gfx::Size frame_size_in_dip) { DCHECK(type_ == LAYER_TEXTURED || type_ == LAYER_SOLID_COLOR); diff --git a/ui/compositor/layer.h b/ui/compositor/layer.h index d49101b..97c7535 100644 --- a/ui/compositor/layer.h +++ b/ui/compositor/layer.h @@ -274,8 +274,6 @@ class COMPOSITOR_EXPORT Layer scoped_ptr<cc::SingleReleaseCallback> release_callback, gfx::Size texture_size_in_dip); void SetTextureSize(gfx::Size texture_size_in_dip); - void SetTextureFlipped(bool flipped); - bool TextureFlipped() const; // Begins showing delegated frames from the |frame_provider|. void SetShowDelegatedContent(cc::DelegatedFrameProvider* frame_provider, diff --git a/ui/compositor/reflector.cc b/ui/compositor/reflector.cc deleted file mode 100644 index f25136d..0000000 --- a/ui/compositor/reflector.cc +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "ui/compositor/reflector.h" - -namespace ui { - -Reflector::Reflector() { -} - -Reflector::~Reflector() { -} - -void Reflector::OnMirroringCompositorResized() { -} - -} // namespace ui diff --git a/ui/compositor/reflector.h b/ui/compositor/reflector.h index 6423c26..4145695 100644 --- a/ui/compositor/reflector.h +++ b/ui/compositor/reflector.h @@ -6,20 +6,18 @@ #define UI_COMPOSITOR_REFLECTOR_H_ #include "base/memory/ref_counted.h" -#include "ui/compositor/compositor_export.h" namespace ui { -class COMPOSITOR_EXPORT Reflector - : public base::RefCountedThreadSafe<Reflector> { +class Reflector : public base::RefCountedThreadSafe<Reflector> { public: - Reflector(); + Reflector() {} - virtual void OnMirroringCompositorResized(); + virtual void OnMirroringCompositorResized() {} protected: friend class base::RefCountedThreadSafe<Reflector>; - virtual ~Reflector(); + virtual ~Reflector() {} DISALLOW_COPY_AND_ASSIGN(Reflector); }; |