Add DialogShowParams to <dialog>'s show() and showModal()

third_party/WebKit/Source/core/html/HTMLDialogElement.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
@@ skipping 14 matching lines @@
 
 #include "core/html/HTMLDialogElement.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/AXObjectCache.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/NodeTraversal.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/UseCounter.h"
+#include "core/html/DialogShowParams.h"
 #include "core/html/HTMLFormControlElement.h"
 #include "core/style/ComputedStyle.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
 // This function chooses the focused element when show() or showModal() is
 // invoked, as described in their spec.
 static void setFocusForDialog(HTMLDialogElement* dialog) {
@@ skipping 86 matching lines @@
   if (m_centeringMode == NeedsCentering)
     setNotCentered();
 }
 
 void HTMLDialogElement::scheduleCloseEvent() {
   Event* event = Event::create(EventTypeNames::close);
   event->setTarget(this);
   document().enqueueAnimationFrameEvent(event);
 }
 
-void HTMLDialogElement::show() {
+void HTMLDialogElement::show(const DialogShowParams& showParams) {
   if (fastHasAttribute(openAttr))
     return;
   setBooleanAttribute(openAttr, true);
 
+  if (showParams.skipInitialFocus())
+    return;
+
   // The layout must be updated here because setFocusForDialog calls
   // Element::isFocusable, which requires an up-to-date layout.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
-
   setFocusForDialog(this);
 }
 
-void HTMLDialogElement::showModal(ExceptionState& exceptionState) {
+void HTMLDialogElement::showModal(const DialogShowParams& showParams,
+                                  ExceptionState& exceptionState) {
   if (fastHasAttribute(openAttr)) {
     exceptionState.throwDOMException(InvalidStateError,
                                      "The element already has an 'open' "
                                      "attribute, and therefore cannot be "
                                      "opened modally.");
     return;
   }
   if (!isConnected()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      "The element is not in a Document.");
     return;
   }
 
   document().addToTopLayer(this);
   setBooleanAttribute(openAttr, true);
 
   // Throw away the AX cache first, so the subsequent steps don't have a chance
   // of queuing up AX events on objects that would be invalidated when the cache
   // is thrown away.
   inertSubtreesChanged(document());
 
   forceLayoutForCentering();
+
+  if (showParams.skipInitialFocus())
+    return;
+
   setFocusForDialog(this);
 }
 
 void HTMLDialogElement::removedFrom(ContainerNode* insertionPoint) {
   HTMLElement::removedFrom(insertionPoint);
   setNotCentered();
   // FIXME: We should call inertSubtreesChanged() here.
 }
 
 void HTMLDialogElement::setCentered(LayoutUnit centeredPosition) {
@@ skipping 20 matching lines @@
 void HTMLDialogElement::defaultEventHandler(Event* event) {
   if (event->type() == EventTypeNames::cancel) {
     closeDialog();
     event->setDefaultHandled();
     return;
   }
   HTMLElement::defaultEventHandler(event);
 }
 
 }  // namespace blink