Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLFormControlElement.cpp

Issue 2851123002: Merge "Form validation: Do not show validation bubble during printing." to M59. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) 6 * (C) 2006 Alexey Proskuryakov (ap@nypop.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 TextDirection& sub_message_dir) { 458 TextDirection& sub_message_dir) {
459 message_dir = DetermineDirectionality(message); 459 message_dir = DetermineDirectionality(message);
460 if (!sub_message.IsEmpty()) 460 if (!sub_message.IsEmpty())
461 sub_message_dir = GetLayoutObject()->Style()->Direction(); 461 sub_message_dir = GetLayoutObject()->Style()->Direction();
462 } 462 }
463 463
464 void HTMLFormControlElement::UpdateVisibleValidationMessage() { 464 void HTMLFormControlElement::UpdateVisibleValidationMessage() {
465 Page* page = GetDocument().GetPage(); 465 Page* page = GetDocument().GetPage();
466 if (!page || !page->IsPageVisible() || GetDocument().UnloadStarted()) 466 if (!page || !page->IsPageVisible() || GetDocument().UnloadStarted())
467 return; 467 return;
468 if (GetDocument().GetFrame()->ShouldUsePrintingLayout())
469 return;
468 String message; 470 String message;
469 if (GetLayoutObject() && willValidate()) 471 if (GetLayoutObject() && willValidate())
470 message = validationMessage().StripWhiteSpace(); 472 message = validationMessage().StripWhiteSpace();
471 473
472 has_validation_message_ = true; 474 has_validation_message_ = true;
473 ValidationMessageClient* client = &page->GetValidationMessageClient(); 475 ValidationMessageClient* client = &page->GetValidationMessageClient();
474 TextDirection message_dir = TextDirection::kLtr; 476 TextDirection message_dir = TextDirection::kLtr;
475 TextDirection sub_message_dir = TextDirection::kLtr; 477 TextDirection sub_message_dir = TextDirection::kLtr;
476 String sub_message = ValidationSubMessage().StripWhiteSpace(); 478 String sub_message = ValidationSubMessage().StripWhiteSpace();
477 if (message.IsEmpty()) 479 if (message.IsEmpty())
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 const Element& source) { 637 const Element& source) {
636 HTMLElement::CopyNonAttributePropertiesFromElement(source); 638 HTMLElement::CopyNonAttributePropertiesFromElement(source);
637 SetNeedsValidityCheck(); 639 SetNeedsValidityCheck();
638 } 640 }
639 641
640 void HTMLFormControlElement::AssociateWith(HTMLFormElement* form) { 642 void HTMLFormControlElement::AssociateWith(HTMLFormElement* form) {
641 AssociateByParser(form); 643 AssociateByParser(form);
642 }; 644 };
643 645
644 } // namespace blink 646 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/html/HTMLFormControlElementTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698