Backed out changeset 0376b0f2075a (bug 1405445) for conflicting with the merge a=backout

MozReview-Commit-ID: 2ed0eV0Wow3

gfx/layers/wr/WebRenderLayerManager.cpp

@@ -34,7 +34,6 @@ WebRenderLayerManager::WebRenderLayerManager(nsIWidget* aWidget)
   , mIsFirstPaint(false)
   , mTarget(nullptr)
   , mPaintSequenceNumber(0)
-  , mLastDisplayListSize(0)
 {
   MOZ_COUNT_CTOR(WebRenderLayerManager);
 }
@@ -729,7 +728,7 @@ WebRenderLayerManager::EndTransactionWithoutLayer(nsDisplayList* aDisplayList,
   DiscardCompositorAnimations();
 
   wr::LayoutSize contentSize { (float)size.width, (float)size.height };
-  wr::DisplayListBuilder builder(WrBridge()->GetPipeline(), contentSize, mLastDisplayListSize);
+  wr::DisplayListBuilder builder(WrBridge()->GetPipeline(), contentSize);
   wr::IpcResourceUpdateQueue resourceUpdates(WrBridge()->GetShmemAllocator());
 
   { // scoping for StackingContextHelper RAII
@@ -744,7 +743,6 @@ WebRenderLayerManager::EndTransactionWithoutLayer(nsDisplayList* aDisplayList,
     CreateWebRenderCommandsFromDisplayList(aDisplayList, aDisplayListBuilder, sc, builder, resourceUpdates);
 
     builder.Finalize(contentSize, mBuiltDisplayList);
-    mLastDisplayListSize = mBuiltDisplayList.dl.inner.capacity;
 
     // Make a "root" layer data that has everything else as descendants
     mLayerScrollData.emplace_back();

gfx/layers/wr/WebRenderLayerManager.h

@@ -351,8 +351,6 @@ private:
   CanvasDataSet mLastCanvasDatas;
 
   WebRenderUserDataRefTable mWebRenderUserDatas;
-
-  size_t mLastDisplayListSize;
 };
 
 } // namespace layers

gfx/webrender_bindings/WebRenderAPI.cpp

@@ -623,12 +623,11 @@ WebRenderAPI::RunOnRenderThread(UniquePtr<RendererEvent> aEvent)
 }
 
 DisplayListBuilder::DisplayListBuilder(PipelineId aId,
-                                       const wr::LayoutSize& aContentSize,
-                                       size_t aCapacity)
+                                       const wr::LayoutSize& aContentSize)
   : mMaskClipCount(0)
 {
   MOZ_COUNT_CTOR(DisplayListBuilder);
-  mWrState = wr_state_new(aId, aContentSize, aCapacity);
+  mWrState = wr_state_new(aId, aContentSize);
 }
 
 DisplayListBuilder::~DisplayListBuilder()

gfx/webrender_bindings/WebRenderAPI.h

@@ -202,8 +202,7 @@ protected:
 class DisplayListBuilder {
 public:
   explicit DisplayListBuilder(wr::PipelineId aId,
-                              const wr::LayoutSize& aContentSize,
-                              size_t aCapacity = 0);
+                              const wr::LayoutSize& aContentSize);
   DisplayListBuilder(DisplayListBuilder&&) = default;
 
   ~DisplayListBuilder();

gfx/webrender_bindings/src/bindings.rs

@@ -1062,15 +1062,6 @@ impl WebRenderFrameBuilder {
             dl_builder: webrender_api::DisplayListBuilder::new(root_pipeline_id, content_size),
         }
     }
-    pub fn with_capacity(root_pipeline_id: WrPipelineId,
-               content_size: LayoutSize,
-               capacity: usize) -> WebRenderFrameBuilder {
-        WebRenderFrameBuilder {
-            root_pipeline_id: root_pipeline_id,
-            dl_builder: webrender_api::DisplayListBuilder::with_capacity(root_pipeline_id, content_size, capacity),
-        }
-    }
-
 }
 
 pub struct WrState {
@@ -1080,15 +1071,13 @@ pub struct WrState {
 
 #[no_mangle]
 pub extern "C" fn wr_state_new(pipeline_id: WrPipelineId,
-                               content_size: LayoutSize,
-                               capacity: usize) -> *mut WrState {
+                               content_size: LayoutSize) -> *mut WrState {
     assert!(unsafe { !is_in_render_thread() });
 
     let state = Box::new(WrState {
                              pipeline_id: pipeline_id,
-                             frame_builder: WebRenderFrameBuilder::with_capacity(pipeline_id,
-                                                                                 content_size,
-                                                                                 capacity),
+                             frame_builder: WebRenderFrameBuilder::new(pipeline_id,
+                                                                       content_size),
                          });
 
     Box::into_raw(state)

gfx/webrender_bindings/webrender_ffi_generated.h

@@ -1307,8 +1307,7 @@ WR_DESTRUCTOR_SAFE_FUNC;
 
 WR_INLINE
 WrState *wr_state_new(WrPipelineId aPipelineId,
-                      LayoutSize aContentSize,
-                      size_t aCapacity)
+                      LayoutSize aContentSize)
 WR_FUNC;
 
 WR_INLINE