Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1410777 - Remove unnecessary code. r=nical

Browse Source 
As per the TODO, a size change on an image is supported now, so there should be
no need to delete and re-create the image key when the window overlay image
changes size. And since the cleanup function is not invoked from anywhere else
it can also be removed.

MozReview-Commit-ID: JSmK5YmXjlX

--HG--
extra : rebase_source : 0078ccfed9a381c82bcb906a87bdf58d8e9c78e1
This commit is contained in:
Kartikaya Gupta 2017-10-26 14:17:19 -04:00
parent b7e231bc45
commit a8f3618eb0
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
widget/cocoa/nsChildView.h
View File

@ -458,9 +458,6 @@ public:
mozilla::wr::DisplayListBuilder& aBuilder,
mozilla::wr::IpcResourceUpdateQueue& aResourceUpdates) override;
virtual void CleanupWebRenderWindowOverlay(mozilla::layers::WebRenderBridgeChild* aWrBridge,
mozilla::wr::IpcResourceUpdateQueue& aResources) override;
virtual bool PreRender(mozilla::widget::WidgetRenderingContext* aContext) override;
virtual void PostRender(mozilla::widget::WidgetRenderingContext* aContext) override;
virtual void DrawWindowOverlay(mozilla::widget::WidgetRenderingContext* aManager,

18
widget/cocoa/nsChildView.mm
View File

@ -2100,14 +2100,6 @@ nsChildView::AddWindowOverlayWebRenderCommands(layers::WebRenderBridgeChild* aWr
titlebarCGContextDataLength
);
if (mTitlebarImageKey &&
mTitlebarImageSize != size) {
// Delete wr::ImageKey. wr::ImageKey does not support size change.
// TODO: that's not true anymore! (size change is now supported).
CleanupWebRenderWindowOverlay(aWrBridge, aResources);
MOZ_ASSERT(mTitlebarImageKey.isNothing());
}
if (!mTitlebarImageKey) {
mTitlebarImageKey = Some(aWrBridge->GetNextImageKey());
wr::ImageDescriptor descriptor(size, stride, format);
@ -2127,16 +2119,6 @@ nsChildView::AddWindowOverlayWebRenderCommands(layers::WebRenderBridgeChild* aWr
}
}
void
nsChildView::CleanupWebRenderWindowOverlay(layers::WebRenderBridgeChild* aWrBridge,
wr::IpcResourceUpdateQueue& aResources)
{
if (mTitlebarImageKey) {
aResources.DeleteImage(*mTitlebarImageKey);
mTitlebarImageKey = Nothing();
}
}
bool
nsChildView::PreRender(WidgetRenderingContext* aContext)
{

7
widget/nsIWidget.h
View File

@ -1294,13 +1294,6 @@ class nsIWidget : public nsISupports
mozilla::wr::DisplayListBuilder& aBuilder,
mozilla::wr::IpcResourceUpdateQueue& aResources) {}
/**
* Called on the main thread when WebRender resources used for
* AddWindowOverlayWebRenderCommands need to be destroyed.
*/
virtual void CleanupWebRenderWindowOverlay(mozilla::layers::WebRenderBridgeChild* aWrBridge,
mozilla::wr::IpcResourceUpdateQueue& aResources) {}
/**
* Called when Gecko knows which themed widgets exist in this window.
* The passed array contains an entry for every themed widget of the right