Index: third_party/WebKit/Source/core/dom/CompositorProxy.cpp |
diff --git a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp |
index 6f029c19b8262b0b22bdc0f88eb2dc3fba5d48b8..3cabe0c2e62b98da0a8e8ba8098ec8993bcc6689 100644 |
--- a/third_party/WebKit/Source/core/dom/CompositorProxy.cpp |
+++ b/third_party/WebKit/Source/core/dom/CompositorProxy.cpp |
@@ -175,7 +175,9 @@ double CompositorProxy::opacity(ExceptionState& exceptionState) const |
return 0.0; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kOpacity, exceptionState)) |
return 0.0; |
- return m_opacity; |
+ if (!m_state.get()) |
+ return 0.0; |
+ return m_state->opacity(); |
} |
double CompositorProxy::scrollLeft(ExceptionState& exceptionState) const |
@@ -184,7 +186,9 @@ double CompositorProxy::scrollLeft(ExceptionState& exceptionState) const |
return 0.0; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollLeft, exceptionState)) |
return 0.0; |
- return m_scrollLeft; |
+ if (!m_state.get()) |
+ return 0.0; |
+ return m_state->scrollLeft(); |
} |
double CompositorProxy::scrollTop(ExceptionState& exceptionState) const |
@@ -193,7 +197,9 @@ double CompositorProxy::scrollTop(ExceptionState& exceptionState) const |
return 0.0; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollTop, exceptionState)) |
return 0.0; |
- return m_scrollTop; |
+ if (!m_state.get()) |
+ return 0.0; |
+ return m_state->scrollTop(); |
} |
DOMMatrix* CompositorProxy::transform(ExceptionState& exceptionState) const |
@@ -202,7 +208,9 @@ DOMMatrix* CompositorProxy::transform(ExceptionState& exceptionState) const |
return nullptr; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kTransform, exceptionState)) |
return nullptr; |
- return m_transform; |
+ if (!m_state.get()) |
jbroman
2016/06/08 14:59:38
nit: both std::unique_ptr and WTF::OwnPtr have ope
|
+ return DOMMatrix::create(); |
+ return DOMMatrix::create(m_state->transform()); |
} |
void CompositorProxy::setOpacity(double opacity, ExceptionState& exceptionState) |
@@ -211,8 +219,10 @@ void CompositorProxy::setOpacity(double opacity, ExceptionState& exceptionState) |
return; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kOpacity, exceptionState)) |
return; |
- m_opacity = std::min(1., std::max(0., opacity)); |
- m_mutatedProperties |= CompositorMutableProperty::kTransform; |
+ if (!m_state.get()) |
+ return; |
+ |
+ m_state->setOpacity(std::min(1., std::max(0., opacity))); |
} |
void CompositorProxy::setScrollLeft(double scrollLeft, ExceptionState& exceptionState) |
@@ -221,8 +231,9 @@ void CompositorProxy::setScrollLeft(double scrollLeft, ExceptionState& exception |
return; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollLeft, exceptionState)) |
return; |
- m_scrollLeft = scrollLeft; |
- m_mutatedProperties |= CompositorMutableProperty::kScrollLeft; |
+ if (!m_state.get()) |
+ return; |
+ m_state->setScrollLeft(scrollLeft); |
} |
void CompositorProxy::setScrollTop(double scrollTop, ExceptionState& exceptionState) |
@@ -231,8 +242,9 @@ void CompositorProxy::setScrollTop(double scrollTop, ExceptionState& exceptionSt |
return; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kScrollTop, exceptionState)) |
return; |
- m_scrollTop = scrollTop; |
- m_mutatedProperties |= CompositorMutableProperty::kScrollTop; |
+ if (!m_state.get()) |
+ return; |
+ m_state->setScrollTop(scrollTop); |
} |
void CompositorProxy::setTransform(DOMMatrix* transform, ExceptionState& exceptionState) |
@@ -241,8 +253,14 @@ void CompositorProxy::setTransform(DOMMatrix* transform, ExceptionState& excepti |
return; |
if (raiseExceptionIfNotMutable(CompositorMutableProperty::kTransform, exceptionState)) |
return; |
- m_transform = transform; |
- m_mutatedProperties |= CompositorMutableProperty::kTransform; |
+ if (!m_state.get()) |
+ return; |
+ m_state->setTransform(TransformationMatrix::toSkMatrix44(transform->matrix())); |
+} |
+ |
+void CompositorProxy::takeCompositorMutableState(std::unique_ptr<CompositorMutableState> state) |
+{ |
+ m_state = std::move(state); |
} |
bool CompositorProxy::raiseExceptionIfNotMutable(uint32_t property, ExceptionState& exceptionState) const |