| Index: third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.h b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| index 76a77528854946cd0dc179e31a96c7b2c117af1b..18a9d74d75e5102e4a96f9435ac7f98d6b849e18 100644
|
| --- a/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| +++ b/third_party/WebKit/Source/core/dom/CompositorProxy.h
|
| @@ -24,25 +24,16 @@ class CompositorProxy final : public GarbageCollectedFinalized<CompositorProxy>,
|
| DEFINE_WRAPPERTYPEINFO();
|
| public:
|
| static CompositorProxy* create(ExecutionContext*, Element*, const Vector<String>& attributeArray, ExceptionState&);
|
| - static CompositorProxy* create(uint64_t element, uint32_t attributeFlags);
|
| + static CompositorProxy* create(uint64_t element, uint32_t compositorMutableProperties);
|
| virtual ~CompositorProxy();
|
|
|
| - enum class Attributes {
|
| - NONE = 0,
|
| - OPACITY = 1 << 0,
|
| - SCROLL_LEFT = 1 << 1,
|
| - SCROLL_TOP = 1 << 2,
|
| - TOUCH = 1 << 3,
|
| - TRANSFORM = 1 << 4,
|
| - };
|
| -
|
| DEFINE_INLINE_TRACE()
|
| {
|
| visitor->trace(m_transform);
|
| }
|
|
|
| uint64_t elementId() const { return m_elementId; }
|
| - uint32_t bitfieldsSupported() const { return m_bitfieldsSupported; }
|
| + uint32_t compositorMutableProperties() const { return m_compositorMutableProperties; }
|
| bool supports(const String& attribute) const;
|
|
|
| bool connected() const { return m_connected; }
|
| @@ -60,14 +51,14 @@ public:
|
|
|
| protected:
|
| CompositorProxy(Element&, const Vector<String>& attributeArray);
|
| - CompositorProxy(uint64_t element, uint32_t attributeFlags);
|
| + CompositorProxy(uint64_t element, uint32_t compositorMutableProperties);
|
|
|
| private:
|
| - bool raiseExceptionIfNotMutable(Attributes, ExceptionState&) const;
|
| + bool raiseExceptionIfNotMutable(uint32_t compositorMutableProperty, ExceptionState&) const;
|
|
|
| const uint64_t m_elementId = 0;
|
| - const uint32_t m_bitfieldsSupported = 0;
|
| - uint32_t m_mutatedAttributes = 0;
|
| + const uint32_t m_compositorMutableProperties = 0;
|
| + uint32_t m_mutatedProperties = 0;
|
|
|
| double m_opacity = 0;
|
| double m_scrollLeft = 0;
|
|
|