[Oilpan] De-oilpanize ScopedPageLoadDeferrer.

Source/web/WebViewImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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 204 matching lines @@
 // Change the text zoom level by kTextSizeMultiplierRatio each time the user
 // zooms text in or out (ie., change by 20%).  The min and max values limit
 // text zoom to half and 3x the original text size.  These three values match
 // those in Apple's port in WebKit/WebKit/WebView/WebView.mm
 const double WebView::textSizeMultiplierRatio = 1.2;
 const double WebView::minTextSizeMultiplier = 0.5;
 const double WebView::maxTextSizeMultiplier = 3.0;
 
 // Used to defer all page activity in cases where the embedder wishes to run
 // a nested event loop. Using a stack enables nesting of message loop invocations.
-static WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>& pageLoadDeferrerStack()
+static Vector<OwnPtr<ScopedPageLoadDeferrer>>& pageLoadDeferrerStack()
 {
-    DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>>, deferrerStack, (adoptPtrWillBeNoop(new WillBeHeapVector<RawPtrWillBeMember<ScopedPageLoadDeferrer>>())));
-    return *deferrerStack;
+    DEFINE_STATIC_LOCAL(Vector<OwnPtr<ScopedPageLoadDeferrer>>, deferrerStack, ());
+    return deferrerStack;
 }
 
 // Ensure that the WebDragOperation enum values stay in sync with the original
 // DragOperation constants.
 #define STATIC_ASSERT_MATCHING_ENUM(coreName) \
     static_assert(int(coreName) == int(Web##coreName), "DragOperation and WebDragOperation enum mismatch: " #coreName)
 STATIC_ASSERT_MATCHING_ENUM(DragOperationNone);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationCopy);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationLink);
 STATIC_ASSERT_MATCHING_ENUM(DragOperationGeneric);
@@ skipping 110 matching lines @@
     Page::visitedStateChanged(linkHash);
 }
 
 void WebView::resetVisitedLinkState()
 {
     Page::allVisitedStateChanged();
 }
 
 void WebView::willEnterModalLoop()
 {
-    pageLoadDeferrerStack().append(new ScopedPageLoadDeferrer());
+    pageLoadDeferrerStack().append(adoptPtr(new ScopedPageLoadDeferrer()));
 }
 
 void WebView::didExitModalLoop()
 {
     ASSERT(pageLoadDeferrerStack().size());
-
-    ScopedPageLoadDeferrer* deferrer = pageLoadDeferrerStack().last();
-#if ENABLE(OILPAN)
-    deferrer->dispose();
-#else
-    delete deferrer;
-#endif
     pageLoadDeferrerStack().removeLast();
 }
 
 void WebViewImpl::setMainFrame(WebFrame* frame)
 {
     if (frame->isWebLocalFrame()) {
         WebLocalFrameImpl* localFrame = toWebLocalFrameImpl(frame);
         localFrame->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, nullAtom);
         // Composited WebViews want repaints outside the frame visible rect.
         localFrame->frame()->view()->setClipsRepaints(!m_layerTreeView);
@@ skipping 4037 matching lines @@
     if (m_pageColorOverlay)
         m_pageColorOverlay->update();
     if (InspectorOverlayImpl* overlay = inspectorOverlay()) {
         PageOverlay* inspectorPageOverlay = overlay->pageOverlay();
         if (inspectorPageOverlay)
             inspectorPageOverlay->update();
     }
 }
 
 } // namespace blink