[Oilpan] Fix wrong usage off heap collections in WebDevToolsAgentImpl

third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp

 /*
  * Copyright (C) 2010-2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 142 matching lines @@
         if (m_running)
             return;
         m_running = true;
 
         // 0. Flush pending frontend messages.
         WebLocalFrameImpl* frameImpl = WebLocalFrameImpl::fromFrame(frame);
         WebDevToolsAgentImpl* agent = frameImpl->devToolsAgentImpl();
         agent->flushPendingProtocolNotifications();
 
         Vector<WebViewImpl*> views;
-        Vector<WebFrameWidgetImpl*> widgets;
+        WillBeHeapVector<RawPtrWillBeMember<WebFrameWidgetImpl>> widgets;
 
         // 1. Disable input events.
         const HashSet<WebViewImpl*>& viewImpls = WebViewImpl::allInstances();
         HashSet<WebViewImpl*>::const_iterator viewImplsEnd = viewImpls.end();
         for (HashSet<WebViewImpl*>::const_iterator it =  viewImpls.begin(); it != viewImplsEnd; ++it) {
             WebViewImpl* view = *it;
             m_frozenViews.add(view);
             views.append(view);
             view->setIgnoreInputEvents(true);
         }
 
-        const HashSet<WebFrameWidgetImpl*>& widgetImpls = WebFrameWidgetImpl::allInstances();
-        HashSet<WebFrameWidgetImpl*>::const_iterator widgetImplsEnd = widgetImpls.end();
-        for (HashSet<WebFrameWidgetImpl*>::const_iterator it =  widgetImpls.begin(); it != widgetImplsEnd; ++it) {
+        const WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<WebFrameWidgetImpl>>& widgetImpls = WebFrameWidgetImpl::allInstances();
+        WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<WebFrameWidgetImpl>>::const_iterator widgetImplsEnd = widgetImpls.end();
+        for (auto it =  widgetImpls.begin(); it != widgetImplsEnd; ++it) {
             WebFrameWidgetImpl* widget = *it;
             m_frozenWidgets.add(widget);
             widgets.append(widget);
             widget->setIgnoreInputEvents(true);
         }
 
         // 2. Notify embedder about pausing.
         agent->client()->willEnterDebugLoop();
 
         // 3. Disable active objects
         WebView::willEnterModalLoop();
 
         // 4. Process messages until quitNow is called.
         m_messageLoop->run();
 
         // 5. Resume active objects
         WebView::didExitModalLoop();
 
         // 6. Resume input events.
         for (Vector<WebViewImpl*>::iterator it = views.begin(); it != views.end(); ++it) {
             if (m_frozenViews.contains(*it)) {
                 // The view was not closed during the dispatch.
                 (*it)->setIgnoreInputEvents(false);
             }
         }
-        for (Vector<WebFrameWidgetImpl*>::iterator it = widgets.begin(); it != widgets.end(); ++it) {
+        for (WillBeHeapVector<RawPtrWillBeMember<WebFrameWidgetImpl>>::iterator it = widgets.begin(); it != widgets.end(); ++it) {
             if (m_frozenWidgets.contains(*it)) {
                 // The widget was not closed during the dispatch.
                 (*it)->setIgnoreInputEvents(false);
             }
         }
 
         // 7. Notify embedder about resuming.
         agent->client()->didExitDebugLoop();
 
         // 8. All views have been resumed, clear the set.
         m_frozenViews.clear();
         m_frozenWidgets.clear();
 
         m_running = false;
     }
 
     void quitNow() override
     {
         m_messageLoop->quitNow();
     }
 
     bool m_running;
     OwnPtr<WebDevToolsAgentClient::WebKitClientMessageLoop> m_messageLoop;
     typedef HashSet<WebViewImpl*> FrozenViewsSet;
     FrozenViewsSet m_frozenViews;
-    typedef HashSet<WebFrameWidgetImpl*> FrozenWidgetsSet;
+    typedef WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<WebFrameWidgetImpl>> FrozenWidgetsSet;

[haraken, 2015/10/14 08:12:13]

Can we move the typedef to the header file and use FrozenWidgetsSet in other
places?

typedef => using

[peria, 2015/10/15 02:26:06]

Done.

     FrozenWidgetsSet m_frozenWidgets;
     static ClientMessageLoopAdapter* s_instance;
 };
 
 ClientMessageLoopAdapter* ClientMessageLoopAdapter::s_instance = nullptr;
 
 class PageInjectedScriptHostClient: public InjectedScriptHostClient {
 public:
     PageInjectedScriptHostClient() { }
 
@@ skipping 478 matching lines @@
     if (!InspectorBackendDispatcher::getCommandName(message, &commandName))
         return false;
     return commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_pauseCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointByUrlCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_removeBreakpointCmd)
         || commandName == InspectorBackendDispatcher::commandName(InspectorBackendDispatcher::kDebugger_setBreakpointsActiveCmd);
 }
 
 } // namespace blink