Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-11 10:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1182963 - Use nsTHashTable::Iterator in nsPresContext. r=njn

Browse Source 
--HG--
extra : commitid : L15dlyg2wWe
extra : rebase_source : 0e7677cebe5f4a8a530003567c45a7a22377f14a
This commit is contained in:
Ting-Yu Lin 2015-07-15 17:05:07 +08:00
parent 1b097a66dd
commit ac0cb80ce5
1 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
layout/base/nsPresContext.cpp
View File

@ -2849,23 +2849,6 @@ nsRootPresContext::UnregisterPluginForGeometryUpdates(nsIContent* aPlugin)
mRegisteredPlugins.RemoveEntry(aPlugin);
}
static PLDHashOperator
SetPluginHidden(nsRefPtrHashKey<nsIContent>* aEntry, void* userArg)
{
nsIFrame* root = static_cast<nsIFrame*>(userArg);
nsPluginFrame* f = static_cast<nsPluginFrame*>(aEntry->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in SetPluginHidden");
return PL_DHASH_NEXT;
}
if (!nsLayoutUtils::IsAncestorFrameCrossDoc(root, f)) {
// f is not managed by this frame so we should ignore it.
return PL_DHASH_NEXT;
}
f->SetEmptyWidgetConfiguration();
return PL_DHASH_NEXT;
}
void
nsRootPresContext::ComputePluginGeometryUpdates(nsIFrame* aFrame,
nsDisplayListBuilder* aBuilder,
@ -2878,7 +2861,18 @@ nsRootPresContext::ComputePluginGeometryUpdates(nsIFrame* aFrame,
// Initially make the next state for each plugin descendant of aFrame be
// "hidden". Plugins that are visible will have their next state set to
// unhidden by nsDisplayPlugin::ComputeVisibility.
mRegisteredPlugins.EnumerateEntries(SetPluginHidden, aFrame);
for (auto iter = mRegisteredPlugins.Iter(); !iter.Done(); iter.Next()) {
auto f = static_cast<nsPluginFrame*>(iter.Get()->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in ComputePluginGeometryUpdates");
continue;
}
if (!nsLayoutUtils::IsAncestorFrameCrossDoc(aFrame, f)) {
// f is not managed by this frame so we should ignore it.
continue;
}
f->SetEmptyWidgetConfiguration();
}
nsIFrame* rootFrame = FrameManager()->GetRootFrame();
@ -3014,35 +3008,33 @@ SortConfigurations(nsTArray<nsIWidget::Configuration>* aConfigurations)
}
}
struct PluginGetGeometryUpdateClosure {
nsTArray<nsIWidget::Configuration> mConfigurations;
};
static PLDHashOperator
PluginGetGeometryUpdate(nsRefPtrHashKey<nsIContent>* aEntry, void* userArg)
static void
PluginGetGeometryUpdate(nsTHashtable<nsRefPtrHashKey<nsIContent>>& aPlugins,
nsTArray<nsIWidget::Configuration>* aConfigurations)
{
PluginGetGeometryUpdateClosure* closure =
static_cast<PluginGetGeometryUpdateClosure*>(userArg);
nsPluginFrame* f = static_cast<nsPluginFrame*>(aEntry->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in GetPluginGeometryUpdate");
return PL_DHASH_NEXT;
for (auto iter = aPlugins.Iter(); !iter.Done(); iter.Next()) {
auto f = static_cast<nsPluginFrame*>(iter.Get()->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in PluginGeometryUpdate");
continue;
}
f->GetWidgetConfiguration(aConfigurations);
}
f->GetWidgetConfiguration(&closure->mConfigurations);
return PL_DHASH_NEXT;
}
#endif // #ifndef XP_MACOSX
static PLDHashOperator
PluginDidSetGeometryEnumerator(nsRefPtrHashKey<nsIContent>* aEntry, void* userArg)
static void
PluginDidSetGeometry(nsTHashtable<nsRefPtrHashKey<nsIContent>>& aPlugins)
{
nsPluginFrame* f = static_cast<nsPluginFrame*>(aEntry->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in PluginDidSetGeometryEnumerator");
return PL_DHASH_NEXT;
for (auto iter = aPlugins.Iter(); !iter.Done(); iter.Next()) {
auto f = static_cast<nsPluginFrame*>(iter.Get()->GetKey()->GetPrimaryFrame());
if (!f) {
NS_WARNING("Null frame in PluginDidSetGeometry");
continue;
}
f->DidSetWidgetGeometry();
}
f->DidSetWidgetGeometry();
return PL_DHASH_NEXT;
}
void
@ -3051,18 +3043,18 @@ nsRootPresContext::ApplyPluginGeometryUpdates()
#ifndef XP_MACOSX
CancelApplyPluginGeometryTimer();
PluginGetGeometryUpdateClosure closure;
mRegisteredPlugins.EnumerateEntries(PluginGetGeometryUpdate, &closure);
nsTArray<nsIWidget::Configuration> configurations;
PluginGetGeometryUpdate(mRegisteredPlugins, &configurations);
// Walk mRegisteredPlugins and ask each plugin for its configuration
if (!closure.mConfigurations.IsEmpty()) {
nsIWidget* widget = closure.mConfigurations[0].mChild->GetParent();
if (!configurations.IsEmpty()) {
nsIWidget* widget = configurations[0].mChild->GetParent();
NS_ASSERTION(widget, "Plugins must have a parent window");
SortConfigurations(&closure.mConfigurations);
widget->ConfigureChildren(closure.mConfigurations);
SortConfigurations(&configurations);
widget->ConfigureChildren(configurations);
}
#endif // #ifndef XP_MACOSX
mRegisteredPlugins.EnumerateEntries(PluginDidSetGeometryEnumerator, nullptr);
PluginDidSetGeometry(mRegisteredPlugins);
}
void
@ -3073,17 +3065,18 @@ nsRootPresContext::CollectPluginGeometryUpdates(LayerManager* aLayerManager)
// for transmission to the chrome process.
NS_ASSERTION(aLayerManager, "layer manager is invalid!");
mozilla::layers::ClientLayerManager* clm = aLayerManager->AsClientLayerManager();
PluginGetGeometryUpdateClosure closure;
mRegisteredPlugins.EnumerateEntries(PluginGetGeometryUpdate, &closure);
if (closure.mConfigurations.IsEmpty()) {
mRegisteredPlugins.EnumerateEntries(PluginDidSetGeometryEnumerator, nullptr);
nsTArray<nsIWidget::Configuration> configurations;
PluginGetGeometryUpdate(mRegisteredPlugins, &configurations);
if (configurations.IsEmpty()) {
PluginDidSetGeometry(mRegisteredPlugins);
return;
}
SortConfigurations(&closure.mConfigurations);
SortConfigurations(&configurations);
if (clm) {
clm->StorePluginWidgetConfigurations(closure.mConfigurations);
clm->StorePluginWidgetConfigurations(configurations);
}
mRegisteredPlugins.EnumerateEntries(PluginDidSetGeometryEnumerator, nullptr);
PluginDidSetGeometry(mRegisteredPlugins);
#endif // #ifndef XP_MACOSX
}