Oilpan: Remove guardRef and guardDeref from TreeScope.

Source/core/html/HTMLFormElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.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
@@ skipping 64 matching lines @@
 }
 
 PassRefPtr<HTMLFormElement> HTMLFormElement::create(Document& document)
 {
     UseCounter::count(document, UseCounter::FormElement);
     return adoptRef(new HTMLFormElement(document));
 }
 
 HTMLFormElement::~HTMLFormElement()
 {
+#if !ENABLE(OILPAN)
+    // With Oilpan, either removedFrom is called or the document and
+    // form controller are dead as well and there is no need to remove
+    // this form element from it.
     document().formController().willDeleteForm(this);
+#endif

[haraken, 2014/04/24 04:18:43]

I don't think you need to do this in this CL, but you can remove
willDeleteForm(this) from the destructor and instead enable willDeleteForm(this)
in removedFrom() in non-oilpan builds. Then we don't need #if ENABLE(OILPAN) in
this file.

[Mads Ager (chromium), 2014/04/24 10:57:36]

Yeah, this is one of the changes that I would prefer not to do at this point. If
we get it wrong we can have stale pointers in the non-oilpan build which we
don't want.

 }
 
 bool HTMLFormElement::rendererIsNeeded(const RenderStyle& style)
 {
     if (!m_wasDemoted)
         return HTMLElement::rendererIsNeeded(style);
 
     ContainerNode* node = parentNode();
     if (!node || !node->renderer())
         return HTMLElement::rendererIsNeeded(style);
@@ skipping 57 matching lines @@
             notifyFormRemovedFromTree(images, root);
         } else {
             Vector<HTMLImageElement*> images;
             collectImageElements(insertionPoint->highestAncestorOrSelf(), images);
             notifyFormRemovedFromTree(images, root);
             collectImageElements(root, images);
             notifyFormRemovedFromTree(images, root);
         }
     }
     HTMLElement::removedFrom(insertionPoint);
+#if ENABLE(OILAPN)
+    document().formController().willDeleteForm(this);
+#endif

[haraken, 2014/04/24 04:18:43]

I'd put this before calling HTMLElement::removedFrom(). We normally make
SuperClass::removedFrom() as the last call.

[Mads Ager (chromium), 2014/04/24 10:57:36]

Done.

 }
 
 void HTMLFormElement::handleLocalEvents(Event* event)
 {
     Node* targetNode = event->target()->toNode();
     if (event->eventPhase() != Event::CAPTURING_PHASE && targetNode && targetNode != this && (event->type() == EventTypeNames::submit || event->type() == EventTypeNames::reset)) {
         event->stopPropagation();
         return;
     }
     HTMLElement::handleLocalEvents(event);
@@ skipping 600 matching lines @@
 }
 
 void HTMLFormElement::setDemoted(bool demoted)
 {
     if (demoted)
         UseCounter::count(document(), UseCounter::DemotedFormElement);
     m_wasDemoted = demoted;
 }
 
 } // namespace