| Index: Source/core/page/Page.cpp
|
| diff --git a/Source/core/page/Page.cpp b/Source/core/page/Page.cpp
|
| index 9ac5da854dca027033633f2467dcdc9910a3320d..4f04582cf53d73adb87d455bfebabcf0574e2b8d 100644
|
| --- a/Source/core/page/Page.cpp
|
| +++ b/Source/core/page/Page.cpp
|
| @@ -53,6 +53,7 @@
|
| #include "core/rendering/FastTextAutosizer.h"
|
| #include "core/rendering/RenderView.h"
|
| #include "core/rendering/TextAutosizer.h"
|
| +#include "core/speech/SpeechInput.h"
|
| #include "core/storage/StorageNamespace.h"
|
| #include "platform/plugins/PluginData.h"
|
| #include "wtf/HashMap.h"
|
| @@ -461,8 +462,8 @@ void Page::settingsChanged(SettingsDelegate::ChangeType changeType)
|
| frame->document()->initDNSPrefetch();
|
| break;
|
| case SettingsDelegate::MultisamplingChange: {
|
| - HashSet<MultisamplingChangedObserver*>::iterator stop = m_multisamplingChangedObservers.end();
|
| - for (HashSet<MultisamplingChangedObserver*>::iterator it = m_multisamplingChangedObservers.begin(); it != stop; ++it)
|
| + WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> >::iterator stop = m_multisamplingChangedObservers.end();
|
| + for (WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> >::iterator it = m_multisamplingChangedObservers.begin(); it != stop; ++it)
|
| (*it)->multisamplingChanged(m_settings->openGLMultisamplingEnabled());
|
| break;
|
| }
|
| @@ -519,9 +520,18 @@ PassOwnPtr<LifecycleNotifier<Page> > Page::createLifecycleNotifier()
|
|
|
| void Page::trace(Visitor* visitor)
|
| {
|
| + visitor->registerWeakMembers<Page, &Page::clearWeakMembers>(this);
|
| + visitor->trace(m_multisamplingChangedObservers);
|
| Supplementable<Page>::trace(visitor);
|
| }
|
|
|
| +void Page::clearWeakMembers(Visitor* visitor)
|
| +{
|
| + SpeechInput* input = SpeechInput::from(this);
|
| + if (input)
|
| + input->clearWeakMembers(visitor);
|
| +}
|
| +
|
| void Page::willBeDestroyed()
|
| {
|
| // Disable all agents prior to resetting the frame view.
|
|
|