зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1682030 - Remove NPAPI windowed plugin layer support r=bas
Removes stale windowed NPAPI plugin layers support as part of removing all NPAPI support. Differential Revision: https://phabricator.services.mozilla.com/D107153
This commit is contained in:
Родитель
9032efe20c
Коммит
7fc6fe2241
|
@ -387,13 +387,6 @@ bool ClientLayerManager::EndTransactionInternal(
|
|||
return !mTransactionIncomplete;
|
||||
}
|
||||
|
||||
void ClientLayerManager::StorePluginWidgetConfigurations(
|
||||
const nsTArray<nsIWidget::Configuration>& aConfigurations) {
|
||||
if (mForwarder) {
|
||||
mForwarder->StorePluginWidgetConfigurations(aConfigurations);
|
||||
}
|
||||
}
|
||||
|
||||
void ClientLayerManager::EndTransaction(DrawPaintedLayerCallback aCallback,
|
||||
void* aCallbackData,
|
||||
EndTransactionFlags aFlags) {
|
||||
|
|
|
@ -145,15 +145,6 @@ class ClientLayerManager final : public LayerManager,
|
|||
|
||||
void SetFocusTarget(const FocusTarget& aFocusTarget) override;
|
||||
|
||||
/**
|
||||
* Pass through call to the forwarder for nsPresContext's
|
||||
* CollectPluginGeometryUpdates. Passes widget configuration information
|
||||
* to the compositor for transmission to the chrome process. This
|
||||
* configuration gets set when the window paints.
|
||||
*/
|
||||
void StorePluginWidgetConfigurations(
|
||||
const nsTArray<nsIWidget::Configuration>& aConfigurations) override;
|
||||
|
||||
// Drop cached resources and ask our shadow manager to do the same,
|
||||
// if we have one.
|
||||
void ClearCachedResources(Layer* aSubtree = nullptr) override;
|
||||
|
|
|
@ -814,7 +814,7 @@ void CompositorBridgeParent::NotifyShadowTreeTransaction(
|
|||
bool aScheduleComposite, uint32_t aPaintSequenceNumber,
|
||||
bool aIsRepeatTransaction, bool aHitTestUpdate) {
|
||||
if (!aIsRepeatTransaction && mLayerManager && mLayerManager->GetRoot()) {
|
||||
AutoResolveRefLayers resolve(mCompositionManager, this, nullptr);
|
||||
AutoResolveRefLayers resolve(mCompositionManager, this);
|
||||
|
||||
if (mApzUpdater) {
|
||||
mApzUpdater->UpdateFocusState(mRootLayerTreeID, aId, aFocusTarget);
|
||||
|
|
|
@ -36,7 +36,6 @@ class LayerTransactionParent final : public PLayerTransactionParent,
|
|||
public mozilla::ipc::IShmemAllocator {
|
||||
typedef nsTArray<Edit> EditArray;
|
||||
typedef nsTArray<OpDestroy> OpDestroyArray;
|
||||
typedef nsTArray<PluginWindowData> PluginsArray;
|
||||
|
||||
friend class PLayerTransactionParent;
|
||||
|
||||
|
|
|
@ -309,14 +309,6 @@ struct LayerAttributes {
|
|||
SpecificLayerAttributes specific;
|
||||
};
|
||||
|
||||
// See nsIWidget Configurations
|
||||
[Comparable] struct PluginWindowData {
|
||||
uintptr_t windowId;
|
||||
LayoutDeviceIntRect[] clip;
|
||||
LayoutDeviceIntRect bounds;
|
||||
bool visible;
|
||||
};
|
||||
|
||||
struct OpSetSimpleLayerAttributes {
|
||||
LayerHandle layer;
|
||||
SimpleLayerAttributes attrs;
|
||||
|
@ -543,7 +535,6 @@ struct TransactionInfo
|
|||
uint64_t fwdTransactionId;
|
||||
TransactionId id;
|
||||
TargetConfig targetConfig;
|
||||
PluginWindowData[] plugins;
|
||||
bool isFirstPaint;
|
||||
FocusTarget focusTarget;
|
||||
bool scheduleComposite;
|
||||
|
|
|
@ -531,19 +531,6 @@ bool ShadowLayerForwarder::InWorkerThread() {
|
|||
return GetTextureForwarder()->GetThread()->IsOnCurrentThread();
|
||||
}
|
||||
|
||||
void ShadowLayerForwarder::StorePluginWidgetConfigurations(
|
||||
const nsTArray<nsIWidget::Configuration>& aConfigurations) {
|
||||
// Cache new plugin widget configs here until we call update, at which
|
||||
// point this data will get shipped over to chrome.
|
||||
mPluginWindowData.Clear();
|
||||
for (uint32_t idx = 0; idx < aConfigurations.Length(); idx++) {
|
||||
const nsIWidget::Configuration& configuration = aConfigurations[idx];
|
||||
mPluginWindowData.AppendElement(
|
||||
PluginWindowData(configuration.mWindowID, configuration.mClipRegion,
|
||||
configuration.mBounds, configuration.mVisible));
|
||||
}
|
||||
}
|
||||
|
||||
void ShadowLayerForwarder::SendPaintTime(TransactionId aId,
|
||||
TimeDuration aPaintTime) {
|
||||
if (!IPCOpen() || !mShadowManager->SendPaintTime(aId, aPaintTime)) {
|
||||
|
@ -684,7 +671,6 @@ bool ShadowLayerForwarder::EndTransaction(
|
|||
info.toDestroy() = mTxn->mDestroyedActors.Clone();
|
||||
info.fwdTransactionId() = GetFwdTransactionId();
|
||||
info.id() = aId;
|
||||
info.plugins() = mPluginWindowData.Clone();
|
||||
info.isFirstPaint() = mIsFirstPaint;
|
||||
info.focusTarget() = mFocusTarget;
|
||||
info.scheduleComposite() = aScheduleComposite;
|
||||
|
|
|
@ -265,14 +265,6 @@ class ShadowLayerForwarder final : public LayersIPCActor,
|
|||
*/
|
||||
void SetShadowManager(PLayerTransactionChild* aShadowManager);
|
||||
|
||||
/**
|
||||
* Layout calls here to cache current plugin widget configuration
|
||||
* data. We ship this across with the rest of the layer updates when
|
||||
* we update. Chrome handles applying these changes.
|
||||
*/
|
||||
void StorePluginWidgetConfigurations(
|
||||
const nsTArray<nsIWidget::Configuration>& aConfigurations);
|
||||
|
||||
void StopReceiveAsyncParentMessge();
|
||||
|
||||
void ClearCachedResources();
|
||||
|
@ -421,7 +413,6 @@ class ShadowLayerForwarder final : public LayersIPCActor,
|
|||
DiagnosticTypes mDiagnosticTypes;
|
||||
bool mIsFirstPaint;
|
||||
FocusTarget mFocusTarget;
|
||||
nsTArray<PluginWindowData> mPluginWindowData;
|
||||
UniquePtr<ActiveResourceTracker> mActiveResourceTracker;
|
||||
uint64_t mNextLayerHandle;
|
||||
nsTHashMap<nsUint64HashKey, CompositableClient*> mCompositables;
|
||||
|
|
Загрузка…
Ссылка в новой задаче