| Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| index 3dfafef0ee9ec043639d4929c5c9bb66ae20b520..d5322dee45b9de6b1d75968d8b5dac532b454589 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| @@ -120,12 +120,14 @@ void HTMLFrameElementBase::parseAttribute(const QualifiedName& name,
|
| } else if (name == srcAttr && !fastHasAttribute(srcdocAttr)) {
|
| setLocation(stripLeadingAndTrailingHTMLSpaces(value));
|
| } else if (name == idAttr) {
|
| - // Important to call through to base for the id attribute so the hasID bit gets set.
|
| + // Important to call through to base for the id attribute so the hasID bit
|
| + // gets set.
|
| HTMLFrameOwnerElement::parseAttribute(name, oldValue, value);
|
| m_frameName = value;
|
| } else if (name == nameAttr) {
|
| m_frameName = value;
|
| - // FIXME: If we are already attached, this doesn't actually change the frame's name.
|
| + // FIXME: If we are already attached, this doesn't actually change the
|
| + // frame's name.
|
| // FIXME: If we are already attached, this doesn't check for frame name
|
| // conflicts and generate a unique frame name.
|
| } else if (name == marginwidthAttr) {
|
| @@ -135,7 +137,8 @@ void HTMLFrameElementBase::parseAttribute(const QualifiedName& name,
|
| setMarginHeight(value.toInt());
|
| // FIXME: If we are already attached, this has no effect.
|
| } else if (name == scrollingAttr) {
|
| - // Auto and yes both simply mean "allow scrolling." No means "don't allow scrolling."
|
| + // Auto and yes both simply mean "allow scrolling." No means "don't allow
|
| + // scrolling."
|
| if (equalIgnoringCase(value, "auto") || equalIgnoringCase(value, "yes"))
|
| setScrollingMode(ScrollbarAuto);
|
| else if (equalIgnoringCase(value, "no"))
|
| @@ -199,12 +202,12 @@ bool HTMLFrameElementBase::supportsFocus() const {
|
| void HTMLFrameElementBase::setFocus(bool received) {
|
| HTMLFrameOwnerElement::setFocus(received);
|
| if (Page* page = document().page()) {
|
| - if (received)
|
| + if (received) {
|
| page->focusController().setFocusedFrame(contentFrame());
|
| - else if (
|
| - page->focusController().focusedFrame() ==
|
| - contentFrame()) // Focus may have already been given to another frame, don't take it away.
|
| + } else if (page->focusController().focusedFrame() == contentFrame()) {
|
| + // Focus may have already been given to another frame, don't take it away.
|
| page->focusController().setFocusedFrame(nullptr);
|
| + }
|
| }
|
| }
|
|
|
|
|