New interface and function for form association

third_party/WebKit/Source/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * 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 19 matching lines @@
 #include "core/css/MediaQueryMatcher.h"
 #include "core/css/MediaValuesDynamic.h"
 #include "core/css/parser/SizesAttributeParser.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/fetch/ImageResource.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/LocalDOMWindow.h"
+#include "core/html/FormAssociated.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageFallbackHelper.h"
 #include "core/html/HTMLPictureElement.h"
 #include "core/html/HTMLSourceElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/parser/HTMLSrcsetParser.h"
 #include "core/imagebitmap/ImageBitmapOptions.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 42 matching lines @@
       ActiveScriptWrappable(this),
       m_imageLoader(HTMLImageLoader::create(this)),
       m_imageDevicePixelRatio(1.0f),
       m_source(nullptr),
       m_formWasSetByParser(false),
       m_elementCreatedByParser(createdByParser),
       m_useFallbackContent(false),
       m_isFallbackImage(false),
       m_referrerPolicy(ReferrerPolicyDefault) {
   setHasCustomStyleCallbacks();
-  if (form && form->isConnected()) {
-    m_form = form;
-    m_formWasSetByParser = true;
-    m_form->associate(*this);
-    m_form->didAssociateByParser();
-  }
 }
 
 HTMLImageElement* HTMLImageElement::create(Document& document) {
   return new HTMLImageElement(document);
 }
 
 HTMLImageElement* HTMLImageElement::create(Document& document,
                                            HTMLFormElement* form,
                                            bool createdByParser) {
   return new HTMLImageElement(document, form, createdByParser);
@@ skipping 766 matching lines @@
 IntSize HTMLImageElement::bitmapSourceSize() const {
   ImageResource* image = cachedImage();
   if (!image)
     return IntSize();
   LayoutSize lSize = image->imageSize(
       LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
   DCHECK(lSize.fraction().isZero());
   return IntSize(lSize.width().toInt(), lSize.height().toInt());
 }
 
+void HTMLImageElement::setAssociatedForm(HTMLFormElement* form) {

[tkent, 2016/12/05 01:53:50]

You move the association code to setAssociatedForm() in HTMLImageElement, but
not for HTMLFormControlElement and HTMLObjectElement.  It's inconsistent.

I recommend:
 - Do it for HTMLFormControlElement and HTMLObjectElement too, or
 - Don't add FormAssociated::setAssociatedForm at all in this CL, and introduce
it and update HTMLImageElement, HTMLFormControlElement, and HTMLObjectElement in
a next CL.

+  if (form && form->isConnected()) {
+    m_form = form;
+    m_formWasSetByParser = true;
+    m_form->associate(*this);
+    m_form->didAssociateByParser();
+  }
+};
+
 }  // namespace blink