corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1318066 - Revert the changes for packing the webrender shaders. r=kats?

Browse Source 
Revert "Bug 1318066 - Provide WR with the path to the resources directory. r=jrmuizel?"
This reverts commit 6aeb295d19b80c368cb3a31a096ac76b745797df

Revert "Bug 1318066 - Ensure webrender resources are bundled into the Firefox installation. r=jrmuizel?"
This reverts commit fdfd418626ad2bedc33a6bd813a3472617a9b1e3

MozReview-Commit-ID: FXSAXK5qsmr
This commit is contained in:
JerryShih
2016-11-18 21:56:47 +08:00
parent 2e6f8d233d
commit 3fa7b53999
15 changed files with 17 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
View File

@@ -248,8 +248,7 @@ CrossProcessCompositorBridgeParent::DeallocPAPZParent(PAPZParent* aActor)
}
PWebRenderBridgeParent*
CrossProcessCompositorBridgeParent::AllocPWebRenderBridgeParent(const uint64_t& aPipelineId,
const nsString& aResourcePath)
CrossProcessCompositorBridgeParent::AllocPWebRenderBridgeParent(const uint64_t& aPipelineId)
{
#ifndef MOZ_ENABLE_WEBRENDER
// Extra guard since this in the parent process and we don't want a malicious
@@ -269,7 +268,7 @@ CrossProcessCompositorBridgeParent::AllocPWebRenderBridgeParent(const uint64_t&
WebRenderBridgeParent* root = sIndirectLayerTrees[cbp->RootLayerTreeId()].mWRBridge.get();
WebRenderBridgeParent* parent = new WebRenderBridgeParent(
aPipelineId, nullptr, nullptr, root->GLContext(), root->WindowState(), root->Compositor());
aPipelineId, nullptr, root->GLContext(), root->WindowState(), root->Compositor());
parent->AddRef(); // IPDL reference
sIndirectLayerTrees[aPipelineId].mWRBridge = parent;