compositor-worker: plumb element id and mutable properties

third_party/WebKit/Source/core/dom/Element.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 955 matching lines @@
 
     double scaledLeft = viewport->scrollPositionDouble().x();
     double scaledTop = viewport->scrollPositionDouble().y();
     if (scrollToOptions.hasLeft())
         scaledLeft = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.left()) * frame->pageZoomFactor();
     if (scrollToOptions.hasTop())
         scaledTop = ScrollableArea::normalizeNonFiniteScroll(scrollToOptions.top()) * frame->pageZoomFactor();
     viewport->setScrollPosition(DoublePoint(scaledLeft, scaledTop), ProgrammaticScroll, scrollBehavior);
 }
 
-void Element::incrementProxyCount()
+bool Element::hasCompositorProxy() const
 {
-    if (ensureElementRareData().incrementProxyCount() == 1)
+    return hasRareData() && elementRareData()->proxiedPropertyCounts();
+}
+
+void Element::incrementProxiedPropertyCounts(uint32_t mutableProperties)
+{
+    const bool hadProxy = hasCompositorProxy();

[esprehn, 2015/12/02 03:28:49]

no const on local primitive values

[Ian Vollick, 2015/12/03 17:54:43]

Done.

+    ensureElementRareData().incrementProxiedPropertyCounts(mutableProperties);

[esprehn, 2015/12/02 03:28:48]

you'd normally write this the other way, you'd write:

ElementRareData& rareData = ensureElementRareData();
if (!rareData.proxiedPropertyCounts())
  setNeedsStyleRecalc(...);
rareData.incrementProxiedPropertyCounts(mutableProperties);

[Ian Vollick, 2015/12/03 17:54:43]

That looks much better. Done.

+    if (!hadProxy && hasCompositorProxy())
         setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CompositorProxy));
 }
 
-void Element::decrementProxyCount()
+void Element::decrementProxiedPropertyCounts(uint32_t mutableProperties)
 {
-    if (ensureElementRareData().decrementProxyCount() == 0)
+    ASSERT(hasRareData());
+    const bool hadProxy = hasCompositorProxy();

[esprehn, 2015/12/02 03:28:49]

remove const, but if you're decrementing you must have had a proxy to start, so
this will always be true...

Note no ASSERT is needed, elementRareData() has the assert inside it, we should
really make it return a reference. You want:

ElementRareData& rareData = *elementRareData();
rareData.decrementProxiedPropertyCounts(mutableProperties);
if (!rareData.proxiedPropertyCounts())
  setNeedsStyleRecalc(...);

[Ian Vollick, 2015/12/03 17:54:43]

Done.

+    elementRareData()->decrementProxiedPropertyCounts(mutableProperties);
+    if (hadProxy && !hasCompositorProxy())
         setNeedsStyleRecalc(LocalStyleChange, StyleChangeReasonForTracing::create(StyleChangeReason::CompositorProxy));
 }
 
+uint32_t Element::compositorMutableProperties() const
+{
+    if (!hasCompositorProxy())
+        return WebCompositorMutablePropertyNone;
+    return elementRareData()->proxiedPropertyCounts()->proxiedProperties();
+}
+
 bool Element::hasNonEmptyLayoutSize() const
 {
     document().updateLayoutIgnorePendingStylesheets();
 
     if (LayoutBoxModelObject* box = layoutBoxModelObject())
         return box->hasNonEmptyLayoutSize();
     return false;
 }
 
 IntRect Element::boundsInViewportSpace()
@@ skipping 681 matching lines @@
     if (ElementAnimations* elementAnimations = this->elementAnimations()) {
         elementAnimations->cssAnimations().maybeApplyPendingUpdate(this);
         elementAnimations->updateAnimationFlags(*style);
     }
 
     if (style->hasTransform()) {
         if (const StylePropertySet* inlineStyle = this->inlineStyle())
             style->setHasInlineTransform(inlineStyle->hasProperty(CSSPropertyTransform));
     }
 
-    if (hasRareData() && elementRareData()->proxyCount() > 0)
-        style->setHasCompositorProxy(true);
-
     document().didRecalculateStyleForElement();
     return style.release();
 }
 
 PassRefPtr<ComputedStyle> Element::originalStyleForLayoutObject()
 {
     ASSERT(document().inStyleRecalc());
     return document().ensureStyleResolver().styleForElement(this);
 }
 
@@ skipping 1865 matching lines @@
 {
 #if ENABLE(OILPAN)
     if (hasRareData())
         visitor->trace(elementRareData());
     visitor->trace(m_elementData);
 #endif
     ContainerNode::trace(visitor);
 }
 
 } // namespace blink