[SPv1] Always set a CompositorElementId on main graphics layers; use PaintLayer id.

third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h

Index: third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h
diff --git a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h
index 7cd920bf8191bfd3b9ca8bc96251de4e3d039ac9..6dd31526e375fecd31e531fb3e8708b032412f17 100644
--- a/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h
+++ b/third_party/WebKit/Source/platform/graphics/CompositorMutableStateProvider.h
@@ -5,9 +5,10 @@
 #ifndef CompositorMutableStateProvider_h
 #define CompositorMutableStateProvider_h
 
-#include "platform/PlatformExport.h"
 #include <cstdint>
 #include <memory>
+#include "platform/PlatformExport.h"

[wkorman, 2017/05/18 21:31:57]

Do we need this and next line? Looks like maybe just need something in .cpp
file.

[chrishtr, 2017/05/18 22:15:31]

Fixed. We do need line 10, but moved it to its old location.

+#include "platform/graphics/CompositorElementId.h"
 
 namespace cc {
 class LayerTreeImpl;
@@ -25,8 +26,7 @@ class PLATFORM_EXPORT CompositorMutableStateProvider {
   CompositorMutableStateProvider(cc::LayerTreeImpl*, CompositorMutations*);
   ~CompositorMutableStateProvider();
 
-  std::unique_ptr<CompositorMutableState> GetMutableStateFor(
-      uint64_t element_id);
+  std::unique_ptr<CompositorMutableState> GetMutableStateFor(DOMNodeId);
 
  private:
   cc::LayerTreeImpl* tree_;