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/reflector.h | |
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/reflector.h')
-rw-r--r-- | ui/compositor/reflector.h | 10 |
1 files changed, 4 insertions, 6 deletions
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); }; |