Oilpan: Remove guardRef and guardDeref from TreeScope.

Source/core/page/Page.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All Rights Reserved.
  * Copyright (C) 2008 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 35 matching lines @@
 #include "core/page/FocusController.h"
 #include "core/page/FrameTree.h"
 #include "core/page/PageLifecycleNotifier.h"
 #include "core/page/PointerLockController.h"
 #include "core/page/StorageClient.h"
 #include "core/page/ValidationMessageClient.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #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"
 #include "wtf/RefCountedLeakCounter.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/Base64.h"
 
 namespace WebCore {
 
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, pageCounter, ("Page"));
@@ skipping 397 matching lines @@
         break;
     case SettingsDelegate::MediaTypeChange:
         m_mainFrame->view()->setMediaType(AtomicString(settings().mediaTypeOverride()));
         setNeedsRecalcStyleInAllFrames();
         break;
     case SettingsDelegate::DNSPrefetchingChange:
         for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext())
             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();

[wibling-chromium, 2014/04/24 14:43:06]

Why is this a WillBePersistentHeapHashSet and not just WillBeHeapHashSet?

[Mads Ager (chromium), 2014/04/25 10:58:25]

It should be. It is probably the same iterator type, but it should be. Thanks!
:)

+        for (WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<MultisamplingChangedObserver> >::iterator it = m_multisamplingChangedObservers.begin(); it != stop; ++it)

[wibling-chromium, 2014/04/24 14:43:06]

Ditto.

[Mads Ager (chromium), 2014/04/25 10:58:25]

Done.

             (*it)->multisamplingChanged(m_settings->openGLMultisamplingEnabled());
         break;
     }
     case SettingsDelegate::ImageLoadingChange:
         for (LocalFrame* frame = mainFrame(); frame; frame = frame->tree().traverseNext()) {
             frame->document()->fetcher()->setImagesEnabled(settings().imagesEnabled());
             frame->document()->fetcher()->setAutoLoadImages(settings().loadsImagesAutomatically());
         }
         break;
     case SettingsDelegate::TextAutosizingChange:
@@ skipping 47 matching lines @@
     return static_cast<PageLifecycleNotifier&>(LifecycleContext<Page>::lifecycleNotifier());
 }
 
 PassOwnPtr<LifecycleNotifier<Page> > Page::createLifecycleNotifier()
 {
     return PageLifecycleNotifier::create(this);
 }
 
 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.
     m_inspectorController->willBeDestroyed();
 
     m_mainFrame->setView(nullptr);
 
     allPages().remove(this);
     if (ordinaryPages().contains(this))
         ordinaryPages().remove(this);
@@ skipping 25 matching lines @@
     , spellCheckerClient(0)
     , storageClient(0)
 {
 }
 
 Page::PageClients::~PageClients()
 {
 }
 
 } // namespace WebCore