Form validation: Do not show validation bubble during printing.

It was possible to show it in media query listener. BUG=714849 Review-Url: https://codereview.chromium.org/2845273002 Cr-Commit-Position: refs/heads/master@{#467941}

Form validation: Do not show validation bubble during printing.
It was possible to show it in media query listener. BUG=714849 Review-Url: https://codereview.chromium.org/2845273002 Cr-Commit-Position: refs/heads/master@{#467941}
93c0e261 · tkent · Commit bot · cf0a0e0b · 93c0e261 · 93c0e261
Commit 93c0e261 authored Apr 28, 2017 by tkent Committed by Commit bot Apr 28, 2017
2 changed files
--- a/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp
@@ -465,6 +465,8 @@ void HTMLFormControlElement::UpdateVisibleValidationMessage() {
  Page* page = GetDocument().GetPage();
  if (!page || !page->IsPageVisible() || GetDocument().UnloadStarted())
    return;
+  if (GetDocument().GetFrame()->ShouldUsePrintingLayout())
+    return;
  String message;
  if (GetLayoutObject() && willValidate())
    message = validationMessage().StripWhiteSpace();

--- a/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp
@@ -4,17 +4,55 @@

 #include "core/html/HTMLFormControlElement.h"

+#include <memory>
 #include "core/dom/Document.h"
 #include "core/frame/FrameView.h"
 #include "core/html/HTMLInputElement.h"
 #include "core/layout/LayoutObject.h"
 #include "core/loader/EmptyClients.h"
+#include "core/page/ValidationMessageClient.h"
 #include "core/testing/DummyPageHolder.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include <memory>

 namespace blink {

+namespace {
+class MockValidationMessageClient
+    : public GarbageCollectedFinalized<MockValidationMessageClient>,
+      public ValidationMessageClient {
+  USING_GARBAGE_COLLECTED_MIXIN(MockValidationMessageClient);
+
+ public:
+  void ShowValidationMessage(const Element& anchor,
+                             const String&,
+                             TextDirection,
+                             const String&,
+                             TextDirection) override {
+    anchor_ = anchor;
+  }
+
+  void HideValidationMessage(const Element& anchor) override {
+    if (anchor_ == &anchor)
+      anchor_ = nullptr;
+  }
+
+  bool IsValidationMessageVisible(const Element& anchor) override {
+    return anchor_ == &anchor;
+  }
+
+  void WillUnloadDocument(const Document&) override {}
+  void DocumentDetached(const Document&) override {}
+  void WillBeDestroyed() override {}
+  DEFINE_INLINE_VIRTUAL_TRACE() {
+    visitor->Trace(anchor_);
+    ValidationMessageClient::Trace(visitor);
+  }
+
+ private:
+  Member<const Element> anchor_;
+};
+}
+
 class HTMLFormControlElementTest : public ::testing::Test {
 protected:
  void SetUp() override;
@@ -84,4 +122,21 @@ TEST_F(HTMLFormControlElementTest, customValidationMessageTextDirection) {
  EXPECT_EQ(TextDirection::kRtl, sub_message_dir);
 }

+TEST_F(HTMLFormControlElementTest, UpdateValidationMessageSkippedIfPrinting) {
+  GetDocument().documentElement()->setInnerHTML(
+      "<body><input required id=input></body>");
+  GetDocument().View()->UpdateAllLifecyclePhases();
+  ValidationMessageClient* validation_message_client =
+      new MockValidationMessageClient();
+  GetDocument().GetPage()->SetValidationMessageClient(
+      validation_message_client);
+
+  HTMLInputElement* input =
+      toHTMLInputElement(GetDocument().getElementById("input"));
+  GetDocument().GetFrame()->SetPrinting(true, FloatSize(800, 600),
+                                        FloatSize(800, 600), 1);
+  input->reportValidity();
+  EXPECT_FALSE(validation_message_client->IsValidationMessageVisible(*input));
+}
+
 }  // namespace blink