diff options
| author | jbauman <jbauman@chromium.org> | 2015-09-10 16:23:36 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-10 23:24:53 +0000 |
| commit | 952274d55e14e56573ecac52ad9c9acad0a0e63e (patch) | |
| tree | 401bbe7ec6ea2b9d64a4b38358cb8e2ddd461dde /cc/blink/web_layer_impl.h | |
| parent | 00c9ca679badffc7584439fff00f18cb3977d5da (diff) | |
| download | chromium_src-952274d55e14e56573ecac52ad9c9acad0a0e63e.zip chromium_src-952274d55e14e56573ecac52ad9c9acad0a0e63e.tar.gz chromium_src-952274d55e14e56573ecac52ad9c9acad0a0e63e.tar.bz2 | |
Prevent blink from modifying VideoLayer content opaqueness
The video itself determines the content opacity of the layer, so ignore blink's setOpaque and only honor the WebMediaPlayer's.
BUG=526913
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1313863008
Cr-Commit-Position: refs/heads/master@{#348281}
Diffstat (limited to 'cc/blink/web_layer_impl.h')
| -rw-r--r-- | cc/blink/web_layer_impl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cc/blink/web_layer_impl.h b/cc/blink/web_layer_impl.h index eb049b8..ea87fec 100644 --- a/cc/blink/web_layer_impl.h +++ b/cc/blink/web_layer_impl.h @@ -58,6 +58,11 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { CC_BLINK_EXPORT cc::Layer* layer() const; + // If set to true, content opaqueness cannot be changed using setOpaque. + // However, it can still be modified using SetContentsOpaque on the + // cc::Layer. + CC_BLINK_EXPORT void SetContentsOpaqueIsFixed(bool fixed); + // WebLayer implementation. virtual int id() const; virtual void invalidateRect(const blink::WebRect&); @@ -152,6 +157,8 @@ class WebLayerImpl : public blink::WebLayer, public cc::LayerClient { scoped_refptr<cc::Layer> layer_; blink::WebLayerClient* web_layer_client_; + bool contents_opaque_is_fixed_; + private: scoped_ptr<WebToCCAnimationDelegateAdapter> animation_delegate_adapter_; |