Merge "Form validation: Validation bubble should be closed on document unload process." to M58

third_party/WebKit/Source/web/ValidationMessageClientImpl.cpp

 /*
  * Copyright (C) 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 93 matching lines @@
   m_message = String();
   m_finishTime = 0;
   m_webView.client()->hideValidationMessage();
 }
 
 bool ValidationMessageClientImpl::isValidationMessageVisible(
     const Element& anchor) {
   return m_currentAnchor == &anchor;
 }
 
-void ValidationMessageClientImpl::documentDetached(const Document& document) {
+void ValidationMessageClientImpl::willUnloadDocument(const Document& document) {
   if (m_currentAnchor && m_currentAnchor->document() == document)
     hideValidationMessage(*m_currentAnchor);
 }
 
+void ValidationMessageClientImpl::documentDetached(const Document& document) {
+  DCHECK(!m_currentAnchor || m_currentAnchor->document() != document)
+      << "willUnloadDocument() should be called beforehand.";
+}
+
 void ValidationMessageClientImpl::checkAnchorStatus(TimerBase*) {
   DCHECK(m_currentAnchor);
   if (monotonicallyIncreasingTime() >= m_finishTime || !currentView()) {
     hideValidationMessage(*m_currentAnchor);
     return;
   }
 
   IntRect newAnchorRectInViewport =
       m_currentAnchor->visibleBoundsInVisualViewport();
   if (newAnchorRectInViewport.isEmpty()) {
@@ skipping 16 matching lines @@
   if (m_currentAnchor)
     hideValidationMessage(*m_currentAnchor);
 }
 
 DEFINE_TRACE(ValidationMessageClientImpl) {
   visitor->trace(m_currentAnchor);
   ValidationMessageClient::trace(visitor);
 }
 
 }  // namespace blink