Changeset 203337 in webkit
- Timestamp:
- Jul 17, 2016 5:39:37 PM (8 years ago)
- Location:
- trunk/Source
- Files:
-
- 54 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r203334 r203337 1 2016-07-17 Ryosuke Niwa <rniwa@webkit.org> 2 3 Rename fastHasAttribute to hasAttributeWithoutSynchronization 4 https://bugs.webkit.org/show_bug.cgi?id=159864 5 6 Reviewed by Chris Dumez. 7 8 Renamed Rename fastHasAttribute to hasAttributeWithoutSynchronization for clarity. 9 10 * accessibility/AccessibilityListBoxOption.cpp: 11 (WebCore::AccessibilityListBoxOption::isEnabled): 12 * accessibility/AccessibilityObject.cpp: 13 (WebCore::AccessibilityObject::hasAttribute): 14 (WebCore::AccessibilityObject::getAttribute): 15 * accessibility/AccessibilityRenderObject.cpp: 16 (WebCore::AccessibilityRenderObject::determineAccessibilityRole): 17 * bindings/scripts/CodeGenerator.pm: 18 (GetterExpression): 19 * bindings/scripts/test/GObject/WebKitDOMTestObj.cpp: 20 * bindings/scripts/test/JS/JSTestObj.cpp: 21 (WebCore::jsTestObjReflectedBooleanAttr): 22 (WebCore::jsTestObjReflectedCustomBooleanAttr): 23 * bindings/scripts/test/ObjC/DOMTestObj.mm: 24 (-[DOMTestObj reflectedBooleanAttr]): 25 (-[DOMTestObj setReflectedBooleanAttr:]): 26 (-[DOMTestObj reflectedCustomBooleanAttr]): 27 (-[DOMTestObj setReflectedCustomBooleanAttr:]): 28 * dom/Document.cpp: 29 (WebCore::Document::hasManifest): 30 (WebCore::Document::doctype): 31 * dom/Element.h: 32 (WebCore::Node::parentElement): 33 (WebCore::Element::hasAttributeWithoutSynchronization): 34 (WebCore::Element::fastHasAttribute): Deleted. 35 * editing/ApplyStyleCommand.cpp: 36 (WebCore::ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock): 37 * editing/DeleteSelectionCommand.cpp: 38 (WebCore::DeleteSelectionCommand::makeStylingElementsDirectChildrenOfEditableRootToPreventStyleLoss): 39 * editing/markup.cpp: 40 (WebCore::createMarkupInternal): 41 * html/ColorInputType.cpp: 42 (WebCore::ColorInputType::shouldShowSuggestions): 43 * html/FileInputType.cpp: 44 (WebCore::FileInputType::handleDOMActivateEvent): 45 (WebCore::FileInputType::receiveDroppedFiles): 46 * html/FormAssociatedElement.cpp: 47 (WebCore::FormAssociatedElement::didMoveToNewDocument): 48 (WebCore::FormAssociatedElement::insertedInto): 49 (WebCore::FormAssociatedElement::removedFrom): 50 (WebCore::FormAssociatedElement::formAttributeChanged): 51 * html/FormController.cpp: 52 (WebCore::ownerFormForState): 53 * html/GenericCachedHTMLCollection.cpp: 54 (WebCore::GenericCachedHTMLCollection<traversalType>::elementMatches): 55 * html/HTMLAnchorElement.cpp: 56 (WebCore::HTMLAnchorElement::draggable): 57 (WebCore::HTMLAnchorElement::href): 58 (WebCore::HTMLAnchorElement::sendPings): 59 * html/HTMLAppletElement.cpp: 60 (WebCore::HTMLAppletElement::rendererIsNeeded): 61 * html/HTMLElement.cpp: 62 (WebCore::HTMLElement::collectStyleForPresentationAttribute): 63 (WebCore::elementAffectsDirectionality): 64 (WebCore::setHasDirAutoFlagRecursively): 65 * html/HTMLEmbedElement.cpp: 66 (WebCore::HTMLEmbedElement::rendererIsNeeded): 67 * html/HTMLFieldSetElement.cpp: 68 (WebCore::updateFromControlElementsAncestorDisabledStateUnder): 69 (WebCore::HTMLFieldSetElement::disabledAttributeChanged): 70 (WebCore::HTMLFieldSetElement::disabledStateChanged): 71 (WebCore::HTMLFieldSetElement::childrenChanged): 72 * html/HTMLFormControlElement.cpp: 73 (WebCore::HTMLFormControlElement::formNoValidate): 74 (WebCore::HTMLFormControlElement::formAction): 75 (WebCore::HTMLFormControlElement::computeIsDisabledByFieldsetAncestor): 76 (WebCore::shouldAutofocus): 77 * html/HTMLFormElement.cpp: 78 (WebCore::HTMLFormElement::formElementIndex): 79 (WebCore::HTMLFormElement::noValidate): 80 * html/HTMLFrameElement.cpp: 81 (WebCore::HTMLFrameElement::noResize): 82 (WebCore::HTMLFrameElement::didAttachRenderers): 83 * html/HTMLFrameElementBase.cpp: 84 (WebCore::HTMLFrameElementBase::parseAttribute): 85 (WebCore::HTMLFrameElementBase::location): 86 * html/HTMLHRElement.cpp: 87 (WebCore::HTMLHRElement::collectStyleForPresentationAttribute): 88 * html/HTMLImageElement.cpp: 89 (WebCore::HTMLImageElement::isServerMap): 90 * html/HTMLInputElement.cpp: 91 (WebCore::HTMLInputElement::finishParsingChildren): 92 (WebCore::HTMLInputElement::matchesDefaultPseudoClass): 93 (WebCore::HTMLInputElement::isActivatedSubmit): 94 (WebCore::HTMLInputElement::reset): 95 (WebCore::HTMLInputElement::multiple): 96 (WebCore::HTMLInputElement::setSize): 97 (WebCore::HTMLInputElement::shouldUseMediaCapture): 98 * html/HTMLMarqueeElement.cpp: 99 (WebCore::HTMLMarqueeElement::minimumDelay): 100 * html/HTMLMediaElement.cpp: 101 (WebCore::HTMLMediaElement::insertedInto): 102 (WebCore::HTMLMediaElement::selectMediaResource): 103 (WebCore::HTMLMediaElement::loadResource): 104 (WebCore::HTMLMediaElement::autoplay): 105 (WebCore::HTMLMediaElement::preload): 106 (WebCore::HTMLMediaElement::loop): 107 (WebCore::HTMLMediaElement::setLoop): 108 (WebCore::HTMLMediaElement::controls): 109 (WebCore::HTMLMediaElement::setControls): 110 (WebCore::HTMLMediaElement::muted): 111 (WebCore::HTMLMediaElement::setMuted): 112 (WebCore::HTMLMediaElement::selectNextSourceChild): 113 (WebCore::HTMLMediaElement::sourceWasAdded): 114 (WebCore::HTMLMediaElement::mediaSessionTitle): 115 * html/HTMLObjectElement.cpp: 116 (WebCore::HTMLObjectElement::parseAttribute): 117 * html/HTMLOptGroupElement.cpp: 118 (WebCore::HTMLOptGroupElement::isDisabledFormControl): 119 (WebCore::HTMLOptGroupElement::isFocusable): 120 * html/HTMLOptionElement.cpp: 121 (WebCore::HTMLOptionElement::matchesDefaultPseudoClass): 122 (WebCore::HTMLOptionElement::text): 123 * html/HTMLProgressElement.cpp: 124 (WebCore::HTMLProgressElement::isDeterminate): 125 (WebCore::HTMLProgressElement::didElementStateChange): 126 * html/HTMLScriptElement.cpp: 127 (WebCore::HTMLScriptElement::async): 128 (WebCore::HTMLScriptElement::setCrossOrigin): 129 (WebCore::HTMLScriptElement::asyncAttributeValue): 130 (WebCore::HTMLScriptElement::deferAttributeValue): 131 (WebCore::HTMLScriptElement::hasSourceAttribute): 132 (WebCore::HTMLScriptElement::dispatchLoadEvent): 133 * html/HTMLSelectElement.cpp: 134 (WebCore::HTMLSelectElement::reset): 135 * html/HTMLTrackElement.cpp: 136 (WebCore::HTMLTrackElement::isDefault): 137 (WebCore::HTMLTrackElement::ensureTrack): 138 (WebCore::HTMLTrackElement::loadTimerFired): 139 * html/MediaElementSession.cpp: 140 (WebCore::MediaElementSession::wirelessVideoPlaybackDisabled): 141 (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback): 142 (WebCore::MediaElementSession::allowsAutomaticMediaDataLoading): 143 * html/SearchInputType.cpp: 144 (WebCore::SearchInputType::searchEventsShouldBeDispatched): 145 (WebCore::SearchInputType::didSetValueByUserEdit): 146 * inspector/InspectorDOMAgent.cpp: 147 (WebCore::InspectorDOMAgent::buildObjectForNode): 148 * loader/FrameLoader.cpp: 149 (WebCore::FrameLoader::shouldTreatURLAsSrcdocDocument): 150 (WebCore::FrameLoader::findFrameForNavigation): 151 * loader/ImageLoader.cpp: 152 (WebCore::ImageLoader::notifyFinished): 153 * mathml/MathMLSelectElement.cpp: 154 (WebCore::MathMLSelectElement::getSelectedSemanticsChild): 155 * rendering/RenderTableCell.cpp: 156 (WebCore::RenderTableCell::computePreferredLogicalWidths): 157 * rendering/RenderThemeIOS.mm: 158 (WebCore::RenderThemeIOS::adjustMenuListButtonStyle): 159 * rendering/SimpleLineLayout.cpp: 160 (WebCore::SimpleLineLayout::canUseForWithReason): 161 * rendering/svg/RenderSVGResourceClipper.cpp: 162 (WebCore::RenderSVGResourceClipper::drawContentIntoMaskImage): 163 * svg/SVGAnimateMotionElement.cpp: 164 (WebCore::SVGAnimateMotionElement::updateAnimationPath): 165 * svg/SVGAnimationElement.cpp: 166 (WebCore::SVGAnimationElement::startedActiveInterval): 167 (WebCore::SVGAnimationElement::updateAnimation): 168 * svg/animation/SVGSMILElement.cpp: 169 (WebCore::SVGSMILElement::insertedInto): 170 1 171 2016-07-17 Brady Eidson <beidson@apple.com> 2 172 -
trunk/Source/WebCore/accessibility/AccessibilityListBoxOption.cpp
r195452 r203337 68 68 return false; 69 69 70 if (m_optionElement-> fastHasAttribute(disabledAttr))70 if (m_optionElement->hasAttributeWithoutSynchronization(disabledAttr)) 71 71 return false; 72 72 -
trunk/Source/WebCore/accessibility/AccessibilityObject.cpp
r203324 r203337 1994 1994 return false; 1995 1995 1996 return downcast<Element>(*node). fastHasAttribute(attribute);1996 return downcast<Element>(*node).hasAttributeWithoutSynchronization(attribute); 1997 1997 } 1998 1998 -
trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
r203324 r203337 2544 2544 if (node && node->isLink()) 2545 2545 return WebCoreLinkRole; 2546 if (node && is<HTMLImageElement>(*node) && downcast<HTMLImageElement>(*node). fastHasAttribute(usemapAttr))2546 if (node && is<HTMLImageElement>(*node) && downcast<HTMLImageElement>(*node).hasAttributeWithoutSynchronization(usemapAttr)) 2547 2547 return ImageMapRole; 2548 2548 if ((cssBox && cssBox->isListItem()) || (node && node->hasTagName(liTag))) -
trunk/Source/WebCore/bindings/scripts/CodeGenerator.pm
r203324 r203337 655 655 $functionName = "getURLAttribute"; 656 656 } elsif ($attributeType eq "boolean") { 657 $functionName = " fastHasAttribute";657 $functionName = "hasAttributeWithoutSynchronization"; 658 658 } elsif ($attributeType eq "long") { 659 659 $functionName = "getIntegralAttribute"; -
trunk/Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
r203324 r203337 2463 2463 g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), FALSE); 2464 2464 WebCore::TestObj* item = WebKit::core(self); 2465 gboolean result = item-> fastHasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);2465 gboolean result = item->hasAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedbooleanattrAttr); 2466 2466 return result; 2467 2467 } … … 2535 2535 g_return_val_if_fail(WEBKIT_DOM_IS_TEST_OBJ(self), FALSE); 2536 2536 WebCore::TestObj* item = WebKit::core(self); 2537 gboolean result = item-> fastHasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);2537 gboolean result = item->hasAttributeWithoutSynchronization(WebCore::HTMLNames::customContentBooleanAttrAttr); 2538 2538 return result; 2539 2539 } -
trunk/Source/WebCore/bindings/scripts/test/JS/JSTestObj.cpp
r203324 r203337 1798 1798 } 1799 1799 auto& impl = castedThis->wrapped(); 1800 JSValue result = jsBoolean(impl. fastHasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));1800 JSValue result = jsBoolean(impl.hasAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedbooleanattrAttr)); 1801 1801 return JSValue::encode(result); 1802 1802 } … … 1858 1858 } 1859 1859 auto& impl = castedThis->wrapped(); 1860 JSValue result = jsBoolean(impl. fastHasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));1860 JSValue result = jsBoolean(impl.hasAttributeWithoutSynchronization(WebCore::HTMLNames::customContentBooleanAttrAttr)); 1861 1861 return JSValue::encode(result); 1862 1862 } -
trunk/Source/WebCore/bindings/scripts/test/ObjC/DOMTestObj.mm
r202761 r203337 369 369 { 370 370 WebCore::JSMainThreadNullState state; 371 return IMPL-> fastHasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);371 return IMPL->hasAttributeWithoutSynchronization(WebCore::HTMLNames::reflectedbooleanattrAttr); 372 372 } 373 373 … … 417 417 { 418 418 WebCore::JSMainThreadNullState state; 419 return IMPL-> fastHasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);419 return IMPL->hasAttributeWithoutSynchronization(WebCore::HTMLNames::customContentBooleanAttrAttr); 420 420 } 421 421 -
trunk/Source/WebCore/dom/Document.cpp
r203324 r203337 848 848 bool Document::hasManifest() const 849 849 { 850 return documentElement() && documentElement()->hasTagName(htmlTag) && documentElement()-> fastHasAttribute(manifestAttr);850 return documentElement() && documentElement()->hasTagName(htmlTag) && documentElement()->hasAttributeWithoutSynchronization(manifestAttr); 851 851 } 852 852 -
trunk/Source/WebCore/dom/Element.h
r203324 r203337 87 87 // Call this to get the value of an attribute that is known not to be the style 88 88 // attribute or one of the SVG animatable attributes. 89 bool fastHasAttribute(const QualifiedName&) const;89 bool hasAttributeWithoutSynchronization(const QualifiedName&) const; 90 90 const AtomicString& attributeWithoutSynchronization(const QualifiedName&) const; 91 91 #ifndef NDEBUG … … 664 664 } 665 665 666 inline bool Element:: fastHasAttribute(const QualifiedName& name) const666 inline bool Element::hasAttributeWithoutSynchronization(const QualifiedName& name) const 667 667 { 668 668 ASSERT(fastAttributeLookupAllowed(name)); -
trunk/Source/WebCore/editing/ApplyStyleCommand.cpp
r203324 r203337 531 531 // For now, it assumes that if the 'dir' attribute is present, then removing it will suffice, and 532 532 // otherwise it sets the property in the inline style declaration. 533 if (element. fastHasAttribute(dirAttr)) {533 if (element.hasAttributeWithoutSynchronization(dirAttr)) { 534 534 // FIXME: If this is a BDO element, we should probably just remove it if it has no 535 535 // other attributes, like we (should) do with B and I elements. -
trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp
r203326 r203337 435 435 while (node && node != range->pastLastNode()) { 436 436 RefPtr<Node> nextNode = NodeTraversal::next(*node); 437 if ((is<HTMLStyleElement>(*node) && !downcast<HTMLStyleElement>(*node). fastHasAttribute(scopedAttr)) || is<HTMLLinkElement>(*node)) {437 if ((is<HTMLStyleElement>(*node) && !downcast<HTMLStyleElement>(*node).hasAttributeWithoutSynchronization(scopedAttr)) || is<HTMLLinkElement>(*node)) { 438 438 nextNode = NodeTraversal::nextSkippingChildren(*node); 439 439 RefPtr<ContainerNode> rootEditableElement = node->rootEditableElement(); -
trunk/Source/WebCore/editing/markup.cpp
r203326 r203337 630 630 // appears to have no effect. 631 631 if ((!fullySelectedRootStyle || !fullySelectedRootStyle->style() || !fullySelectedRootStyle->style()->getPropertyCSSValue(CSSPropertyBackgroundImage)) 632 && fullySelectedRoot-> fastHasAttribute(backgroundAttr))632 && fullySelectedRoot->hasAttributeWithoutSynchronization(backgroundAttr)) 633 633 fullySelectedRootStyle->style()->setProperty(CSSPropertyBackgroundImage, "url('" + fullySelectedRoot->getAttribute(backgroundAttr) + "')"); 634 634 -
trunk/Source/WebCore/html/ColorInputType.cpp
r202626 r203337 223 223 { 224 224 #if ENABLE(DATALIST_ELEMENT) 225 return element(). fastHasAttribute(listAttr);225 return element().hasAttributeWithoutSynchronization(listAttr); 226 226 #else 227 227 return false; -
trunk/Source/WebCore/html/FileInputType.cpp
r203322 r203337 181 181 FileChooserSettings settings; 182 182 HTMLInputElement& input = element(); 183 settings.allowsMultipleFiles = input. fastHasAttribute(multipleAttr);183 settings.allowsMultipleFiles = input.hasAttributeWithoutSynchronization(multipleAttr); 184 184 settings.acceptMIMETypes = input.acceptMIMETypes(); 185 185 settings.acceptFileExtensions = input.acceptFileExtensions(); … … 405 405 files.append(FileChooserFileInfo(path)); 406 406 407 if (input-> fastHasAttribute(multipleAttr))407 if (input->hasAttributeWithoutSynchronization(multipleAttr)) 408 408 filesChosen(files); 409 409 else { -
trunk/Source/WebCore/html/FormAssociatedElement.cpp
r203324 r203337 64 64 { 65 65 HTMLElement& element = asHTMLElement(); 66 if (oldDocument && element. fastHasAttribute(formAttr))66 if (oldDocument && element.hasAttributeWithoutSynchronization(formAttr)) 67 67 resetFormAttributeTargetObserver(); 68 68 } … … 79 79 return; 80 80 81 if (element. fastHasAttribute(formAttr))81 if (element.hasAttributeWithoutSynchronization(formAttr)) 82 82 resetFormAttributeTargetObserver(); 83 83 } … … 97 97 { 98 98 HTMLElement& element = asHTMLElement(); 99 if (insertionPoint.inDocument() && element. fastHasAttribute(formAttr))99 if (insertionPoint.inDocument() && element.hasAttributeWithoutSynchronization(formAttr)) 100 100 m_formAttributeTargetObserver = nullptr; 101 101 // If the form and element are both in the same tree, preserve the connection to the form. … … 176 176 { 177 177 HTMLElement& element = asHTMLElement(); 178 if (!element. fastHasAttribute(formAttr)) {178 if (!element.hasAttributeWithoutSynchronization(formAttr)) { 179 179 // The form attribute removed. We need to reset form owner here. 180 180 HTMLFormElement* originalForm = m_form; -
trunk/Source/WebCore/html/FormController.cpp
r194819 r203337 36 36 // state during parsing and form owners of such controls might be 37 37 // indeterminate. 38 return control. fastHasAttribute(formAttr) ? 0 : control.form();38 return control.hasAttributeWithoutSynchronization(formAttr) ? 0 : control.form(); 39 39 } 40 40 -
trunk/Source/WebCore/html/GenericCachedHTMLCollection.cpp
r201205 r203337 70 70 return element.hasTagName(embedTag); 71 71 case DocLinks: 72 return (element.hasTagName(aTag) || element.hasTagName(areaTag)) && element. fastHasAttribute(hrefAttr);72 return (element.hasTagName(aTag) || element.hasTagName(areaTag)) && element.hasAttributeWithoutSynchronization(hrefAttr); 73 73 case DocAnchors: 74 return element.hasTagName(aTag) && element. fastHasAttribute(nameAttr);74 return element.hasTagName(aTag) && element.hasAttributeWithoutSynchronization(nameAttr); 75 75 case ByClass: 76 76 case ByTag: -
trunk/Source/WebCore/html/HTMLAnchorElement.cpp
r203326 r203337 282 282 if (equalLettersIgnoringASCIICase(value, "false")) 283 283 return false; 284 return fastHasAttribute(hrefAttr);284 return hasAttributeWithoutSynchronization(hrefAttr); 285 285 } 286 286 … … 350 350 void HTMLAnchorElement::sendPings(const URL& destinationURL) 351 351 { 352 if (! fastHasAttribute(pingAttr) || !document().settings() || !document().settings()->hyperlinkAuditingEnabled())352 if (!hasAttributeWithoutSynchronization(pingAttr) || !document().settings() || !document().settings()->hyperlinkAuditingEnabled()) 353 353 return; 354 354 -
trunk/Source/WebCore/html/HTMLAppletElement.cpp
r203324 r203337 71 71 bool HTMLAppletElement::rendererIsNeeded(const RenderStyle& style) 72 72 { 73 if (! fastHasAttribute(codeAttr))73 if (!hasAttributeWithoutSynchronization(codeAttr)) 74 74 return false; 75 75 return HTMLPlugInImageElement::rendererIsNeeded(style); -
trunk/Source/WebCore/html/HTMLElement.cpp
r203324 r203337 244 244 else if (name == langAttr) { 245 245 // xml:lang has a higher priority than lang. 246 if (! fastHasAttribute(XMLNames::langAttr))246 if (!hasAttributeWithoutSynchronization(XMLNames::langAttr)) 247 247 mapLanguageAttributeToLocale(value, style); 248 248 } else … … 884 884 return false; 885 885 const HTMLElement& element = downcast<HTMLElement>(node); 886 return is<HTMLBDIElement>(element) || element. fastHasAttribute(dirAttr);886 return is<HTMLBDIElement>(element) || element.hasAttributeWithoutSynchronization(dirAttr); 887 887 } 888 888 -
trunk/Source/WebCore/html/HTMLEmbedElement.cpp
r203324 r203337 184 184 bool HTMLEmbedElement::rendererIsNeeded(const RenderStyle& style) 185 185 { 186 if (! fastHasAttribute(typeAttr) && !fastHasAttribute(srcAttr))186 if (!hasAttributeWithoutSynchronization(typeAttr) && !hasAttributeWithoutSynchronization(srcAttr)) 187 187 return false; 188 188 -
trunk/Source/WebCore/html/HTMLFieldSetElement.cpp
r201588 r203337 66 66 control->setAncestorDisabled(isDisabled); 67 67 // Don't call setAncestorDisabled(false) on form controls inside disabled fieldsets. 68 if (is<HTMLFieldSetElement>(*control) && control-> fastHasAttribute(disabledAttr))68 if (is<HTMLFieldSetElement>(*control) && control->hasAttributeWithoutSynchronization(disabledAttr)) 69 69 control = Traversal<HTMLFormControlElement>::nextSkippingChildren(*control, &startNode); 70 70 else … … 75 75 void HTMLFieldSetElement::disabledAttributeChanged() 76 76 { 77 bool hasDisabledAttribute = fastHasAttribute(disabledAttr);77 bool hasDisabledAttribute = hasAttributeWithoutSynchronization(disabledAttr); 78 78 if (m_hasDisabledAttribute != hasDisabledAttribute) { 79 79 m_hasDisabledAttribute = hasDisabledAttribute; … … 95 95 return; 96 96 97 bool thisFieldsetIsDisabled = fastHasAttribute(disabledAttr);97 bool thisFieldsetIsDisabled = hasAttributeWithoutSynchronization(disabledAttr); 98 98 bool hasSeenFirstLegendElement = false; 99 99 for (HTMLElement* control = Traversal<HTMLElement>::firstChild(*this); control; control = Traversal<HTMLElement>::nextSibling(*control)) { … … 110 110 { 111 111 HTMLFormControlElement::childrenChanged(change); 112 if (! fastHasAttribute(disabledAttr))112 if (!hasAttributeWithoutSynchronization(disabledAttr)) 113 113 return; 114 114 -
trunk/Source/WebCore/html/HTMLFormControlElement.cpp
r203324 r203337 104 104 bool HTMLFormControlElement::formNoValidate() const 105 105 { 106 return fastHasAttribute(formnovalidateAttr);106 return hasAttributeWithoutSynchronization(formnovalidateAttr); 107 107 } 108 108 … … 124 124 Element* previousAncestor = nullptr; 125 125 for (Element* ancestor = parentElement(); ancestor; ancestor = ancestor->parentElement()) { 126 if (is<HTMLFieldSetElement>(*ancestor) && ancestor-> fastHasAttribute(disabledAttr)) {126 if (is<HTMLFieldSetElement>(*ancestor) && ancestor->hasAttributeWithoutSynchronization(disabledAttr)) { 127 127 HTMLFieldSetElement& fieldSetAncestor = downcast<HTMLFieldSetElement>(*ancestor); 128 128 bool isInFirstLegend = is<HTMLLegendElement>(previousAncestor) && previousAncestor == fieldSetAncestor.legend(); … … 197 197 if (!element->renderer()) 198 198 return false; 199 if (!element-> fastHasAttribute(autofocusAttr))199 if (!element->hasAttributeWithoutSynchronization(autofocusAttr)) 200 200 return false; 201 201 if (!element->inDocument() || !element->document().renderView()) -
trunk/Source/WebCore/html/HTMLFormElement.cpp
r203324 r203337 552 552 // Treats separately the case where this element has the form attribute 553 553 // for performance consideration. 554 if (associatedHTMLElement. fastHasAttribute(formAttr)) {554 if (associatedHTMLElement.hasAttributeWithoutSynchronization(formAttr)) { 555 555 unsigned short position = compareDocumentPosition(&associatedHTMLElement); 556 556 if (position & DOCUMENT_POSITION_PRECEDING) { … … 675 675 bool HTMLFormElement::noValidate() const 676 676 { 677 return fastHasAttribute(novalidateAttr);677 return hasAttributeWithoutSynchronization(novalidateAttr); 678 678 } 679 679 -
trunk/Source/WebCore/html/HTMLFrameElement.cpp
r201588 r203337 59 59 bool HTMLFrameElement::noResize() const 60 60 { 61 return fastHasAttribute(noresizeAttr);61 return hasAttributeWithoutSynchronization(noresizeAttr); 62 62 } 63 63 -
trunk/Source/WebCore/html/HTMLFrameElementBase.cpp
r203326 r203337 95 95 if (name == srcdocAttr) 96 96 setLocation("about:srcdoc"); 97 else if (name == srcAttr && ! fastHasAttribute(srcdocAttr))97 else if (name == srcAttr && !hasAttributeWithoutSynchronization(srcdocAttr)) 98 98 setLocation(stripLeadingAndTrailingHTMLSpaces(value)); 99 99 else if (name == idAttr) { 100 100 HTMLFrameOwnerElement::parseAttribute(name, value); 101 101 // Falling back to using the 'id' attribute is not standard but some content relies on this behavior. 102 if (! fastHasAttribute(nameAttr))102 if (!hasAttributeWithoutSynchronization(nameAttr)) 103 103 m_frameName = value; 104 104 } else if (name == nameAttr) { … … 168 168 URL HTMLFrameElementBase::location() const 169 169 { 170 if ( fastHasAttribute(srcdocAttr))170 if (hasAttributeWithoutSynchronization(srcdocAttr)) 171 171 return URL(ParsedURLString, "about:srcdoc"); 172 172 return document().completeURL(attributeWithoutSynchronization(srcAttr)); -
trunk/Source/WebCore/html/HTMLHRElement.cpp
r195452 r203337 82 82 addHTMLColorToStyle(style, CSSPropertyBackgroundColor, value); 83 83 } else if (name == noshadeAttr) { 84 if (! fastHasAttribute(colorAttr)) {84 if (!hasAttributeWithoutSynchronization(colorAttr)) { 85 85 addPropertyToPresentationAttributeStyle(style, CSSPropertyBorderStyle, CSSValueSolid); 86 86 -
trunk/Source/WebCore/html/HTMLImageElement.cpp
r203324 r203337 560 560 bool HTMLImageElement::isServerMap() const 561 561 { 562 if (! fastHasAttribute(ismapAttr))562 if (!hasAttributeWithoutSynchronization(ismapAttr)) 563 563 return false; 564 564 -
trunk/Source/WebCore/html/HTMLInputElement.cpp
r203324 r203337 762 762 HTMLTextFormControlElement::finishParsingChildren(); 763 763 if (!m_stateRestored) { 764 bool checked = fastHasAttribute(checkedAttr);764 bool checked = hasAttributeWithoutSynchronization(checkedAttr); 765 765 if (checked) 766 766 setChecked(checked); … … 829 829 if (m_inputType->canBeSuccessfulSubmitButton()) 830 830 return !isDisabledFormControl() && form() && form()->defaultButton() == this; 831 return m_inputType->isCheckable() && fastHasAttribute(checkedAttr);831 return m_inputType->isCheckable() && hasAttributeWithoutSynchronization(checkedAttr); 832 832 } 833 833 … … 853 853 854 854 setAutoFilled(false); 855 setChecked( fastHasAttribute(checkedAttr));855 setChecked(hasAttributeWithoutSynchronization(checkedAttr)); 856 856 m_reflectsCheckedAttribute = true; 857 857 } … … 1283 1283 bool HTMLInputElement::multiple() const 1284 1284 { 1285 return fastHasAttribute(multipleAttr);1285 return hasAttributeWithoutSynchronization(multipleAttr); 1286 1286 } 1287 1287 … … 1799 1799 bool HTMLInputElement::shouldUseMediaCapture() const 1800 1800 { 1801 return isFileUpload() && fastHasAttribute(captureAttr);1801 return isFileUpload() && hasAttributeWithoutSynchronization(captureAttr); 1802 1802 } 1803 1803 #endif -
trunk/Source/WebCore/html/HTMLMarqueeElement.cpp
r203324 r203337 53 53 int HTMLMarqueeElement::minimumDelay() const 54 54 { 55 if (! fastHasAttribute(truespeedAttr)) {55 if (!hasAttributeWithoutSynchronization(truespeedAttr)) { 56 56 // WinIE uses 60ms as the minimum delay by default. 57 57 return 60; -
trunk/Source/WebCore/html/HTMLMediaElement.cpp
r203324 r203337 783 783 if (!m_explicitlyMuted) { 784 784 m_explicitlyMuted = true; 785 m_muted = fastHasAttribute(mutedAttr);785 m_muted = hasAttributeWithoutSynchronization(mutedAttr); 786 786 } 787 787 … … 1264 1264 // 3 - If the media element has a src attribute, then let mode be attribute. 1265 1265 Mode mode = attribute; 1266 if (! fastHasAttribute(srcAttr)) {1266 if (!hasAttributeWithoutSynchronization(srcAttr)) { 1267 1267 // Otherwise, if the media element does not have a src attribute but has a source 1268 1268 // element child, then let mode be children and let candidate be the first such … … 1422 1422 if (!m_explicitlyMuted) { 1423 1423 m_explicitlyMuted = true; 1424 m_muted = fastHasAttribute(mutedAttr);1424 m_muted = hasAttributeWithoutSynchronization(mutedAttr); 1425 1425 } 1426 1426 … … 3013 3013 bool HTMLMediaElement::autoplay() const 3014 3014 { 3015 return fastHasAttribute(autoplayAttr);3015 return hasAttributeWithoutSynchronization(autoplayAttr); 3016 3016 } 3017 3017 … … 3292 3292 bool HTMLMediaElement::loop() const 3293 3293 { 3294 return fastHasAttribute(loopAttr);3294 return hasAttributeWithoutSynchronization(loopAttr); 3295 3295 } 3296 3296 … … 3309 3309 return true; 3310 3310 3311 return fastHasAttribute(controlsAttr);3311 return hasAttributeWithoutSynchronization(controlsAttr); 3312 3312 } 3313 3313 … … 3344 3344 bool HTMLMediaElement::muted() const 3345 3345 { 3346 return m_explicitlyMuted ? m_muted : fastHasAttribute(mutedAttr);3346 return m_explicitlyMuted ? m_muted : hasAttributeWithoutSynchronization(mutedAttr); 3347 3347 } 3348 3348 … … 4206 4206 goto CheckAgain; 4207 4207 4208 if (source-> fastHasAttribute(mediaAttr)) {4208 if (source->hasAttributeWithoutSynchronization(mediaAttr)) { 4209 4209 auto media = source->mediaQuerySet(); 4210 4210 #if !LOG_DISABLED … … 4298 4298 4299 4299 // We should only consider a <source> element when there is not src attribute at all. 4300 if ( fastHasAttribute(srcAttr))4300 if (hasAttributeWithoutSynchronization(srcAttr)) 4301 4301 return; 4302 4302 … … 6822 6822 String HTMLMediaElement::mediaSessionTitle() const 6823 6823 { 6824 if ( fastHasAttribute(titleAttr))6824 if (hasAttributeWithoutSynchronization(titleAttr)) 6825 6825 return attributeWithoutSynchronization(titleAttr); 6826 6826 -
trunk/Source/WebCore/html/HTMLObjectElement.cpp
r203324 r203337 114 114 else if (name == typeAttr) { 115 115 m_serviceType = value.string().left(value.find(';')).convertToASCIILowercase(); 116 invalidateRenderer = ! fastHasAttribute(classidAttr);116 invalidateRenderer = !hasAttributeWithoutSynchronization(classidAttr); 117 117 setNeedsWidgetUpdate(true); 118 118 } else if (name == dataAttr) { … … 124 124 m_imageLoader->updateFromElementIgnoringPreviousError(); 125 125 } 126 invalidateRenderer = ! fastHasAttribute(classidAttr);126 invalidateRenderer = !hasAttributeWithoutSynchronization(classidAttr); 127 127 setNeedsWidgetUpdate(true); 128 128 } else if (name == classidAttr) { -
trunk/Source/WebCore/html/HTMLOptGroupElement.cpp
r203324 r203337 51 51 bool HTMLOptGroupElement::isDisabledFormControl() const 52 52 { 53 return fastHasAttribute(disabledAttr);53 return hasAttributeWithoutSynchronization(disabledAttr); 54 54 } 55 55 -
trunk/Source/WebCore/html/HTMLOptionElement.cpp
r203324 r203337 99 99 bool HTMLOptionElement::matchesDefaultPseudoClass() const 100 100 { 101 return fastHasAttribute(selectedAttr);101 return hasAttributeWithoutSynchronization(selectedAttr); 102 102 } 103 103 -
trunk/Source/WebCore/html/HTMLProgressElement.cpp
r203324 r203337 132 132 bool HTMLProgressElement::isDeterminate() const 133 133 { 134 return fastHasAttribute(valueAttr);134 return hasAttributeWithoutSynchronization(valueAttr); 135 135 } 136 136 -
trunk/Source/WebCore/html/HTMLScriptElement.cpp
r203324 r203337 103 103 bool HTMLScriptElement::async() const 104 104 { 105 return fastHasAttribute(asyncAttr) || forceAsync();105 return hasAttributeWithoutSynchronization(asyncAttr) || forceAsync(); 106 106 } 107 107 … … 160 160 bool HTMLScriptElement::asyncAttributeValue() const 161 161 { 162 return fastHasAttribute(asyncAttr);162 return hasAttributeWithoutSynchronization(asyncAttr); 163 163 } 164 164 165 165 bool HTMLScriptElement::deferAttributeValue() const 166 166 { 167 return fastHasAttribute(deferAttr);167 return hasAttributeWithoutSynchronization(deferAttr); 168 168 } 169 169 170 170 bool HTMLScriptElement::hasSourceAttribute() const 171 171 { 172 return fastHasAttribute(srcAttr);172 return hasAttributeWithoutSynchronization(srcAttr); 173 173 } 174 174 -
trunk/Source/WebCore/html/HTMLSelectElement.cpp
r203302 r203337 1063 1063 1064 1064 HTMLOptionElement& option = downcast<HTMLOptionElement>(*element); 1065 if (option. fastHasAttribute(selectedAttr)) {1065 if (option.hasAttributeWithoutSynchronization(selectedAttr)) { 1066 1066 if (selectedOption && !m_multiple) 1067 1067 selectedOption->setSelectedState(false); -
trunk/Source/WebCore/html/HTMLTrackElement.cpp
r203324 r203337 136 136 bool HTMLTrackElement::isDefault() const 137 137 { 138 return fastHasAttribute(defaultAttr);138 return hasAttributeWithoutSynchronization(defaultAttr); 139 139 } 140 140 … … 184 184 void HTMLTrackElement::loadTimerFired() 185 185 { 186 if (! fastHasAttribute(srcAttr))186 if (!hasAttributeWithoutSynchronization(srcAttr)) 187 187 return; 188 188 -
trunk/Source/WebCore/html/MediaElementSession.cpp
r203324 r203337 315 315 } 316 316 317 if (element. fastHasAttribute(HTMLNames::webkitwirelessvideoplaybackdisabledAttr)) {317 if (element.hasAttributeWithoutSynchronization(HTMLNames::webkitwirelessvideoplaybackdisabledAttr)) { 318 318 LOG(Media, "MediaElementSession::wirelessVideoPlaybackDisabled - returning TRUE because of attribute"); 319 319 return true; … … 456 456 return true; 457 457 458 return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element. fastHasAttribute(HTMLNames::webkit_playsinlineAttr) || element.fastHasAttribute(HTMLNames::playsinlineAttr));458 return settings->inlineMediaPlaybackRequiresPlaysInlineAttribute() && !(element.hasAttributeWithoutSynchronization(HTMLNames::webkit_playsinlineAttr) || element.hasAttributeWithoutSynchronization(HTMLNames::playsinlineAttr)); 459 459 } 460 460 -
trunk/Source/WebCore/html/SearchInputType.cpp
r203322 r203337 181 181 bool SearchInputType::searchEventsShouldBeDispatched() const 182 182 { 183 return element(). fastHasAttribute(incrementalAttr);183 return element().hasAttributeWithoutSynchronization(incrementalAttr); 184 184 } 185 185 -
trunk/Source/WebCore/inspector/InspectorDOMAgent.cpp
r203322 r203337 1380 1380 value->setTemplateContent(buildObjectForNode(&downcast<HTMLTemplateElement>(element).content(), 0, nodesMap)); 1381 1381 1382 if (is<HTMLStyleElement>(element) || (is<HTMLScriptElement>(element) && !element. fastHasAttribute(HTMLNames::srcAttr)))1382 if (is<HTMLStyleElement>(element) || (is<HTMLScriptElement>(element) && !element.hasAttributeWithoutSynchronization(HTMLNames::srcAttr))) 1383 1383 value->setContentSecurityPolicyHash(computeContentSecurityPolicySHA256Hash(element)); 1384 1384 -
trunk/Source/WebCore/loader/FrameLoader.cpp
r203324 r203337 3263 3263 if (!ownerElement->hasTagName(iframeTag)) 3264 3264 return false; 3265 return ownerElement-> fastHasAttribute(srcdocAttr);3265 return ownerElement->hasAttributeWithoutSynchronization(srcdocAttr); 3266 3266 } 3267 3267 -
trunk/Source/WebCore/loader/ImageLoader.cpp
r203324 r203337 287 287 return; 288 288 289 if (element(). fastHasAttribute(HTMLNames::crossoriginAttr) && !resource->passesSameOriginPolicyCheck(*element().document().securityOrigin())) {289 if (element().hasAttributeWithoutSynchronization(HTMLNames::crossoriginAttr) && !resource->passesSameOriginPolicyCheck(*element().document().securityOrigin())) { 290 290 clearImageWithoutConsideringPendingLoadEvent(); 291 291 -
trunk/Source/WebCore/mathml/MathMLSelectElement.cpp
r203326 r203337 175 175 if (child->hasTagName(MathMLNames::annotationTag)) { 176 176 // If the <annotation> element has an src attribute then it is a reference to arbitrary binary data and it is not clear whether we can display it. Hence we just ignore the annotation. 177 if (child-> fastHasAttribute(MathMLNames::srcAttr))177 if (child->hasAttributeWithoutSynchronization(MathMLNames::srcAttr)) 178 178 continue; 179 179 // Otherwise, we assume it is a text annotation that can always be displayed and we stop here. … … 183 183 if (child->hasTagName(MathMLNames::annotation_xmlTag)) { 184 184 // If the <annotation-xml> element has an src attribute then it is a reference to arbitrary binary data and it is not clear whether we can display it. Hence we just ignore the annotation. 185 if (child-> fastHasAttribute(MathMLNames::srcAttr))185 if (child->hasAttributeWithoutSynchronization(MathMLNames::srcAttr)) 186 186 continue; 187 187 // If the <annotation-xml> element has an encoding attribute describing presentation MathML, SVG or HTML we assume the content can be displayed and we stop here. -
trunk/Source/WebCore/rendering/RenderTableCell.cpp
r201635 r203337 184 184 185 185 RenderBlockFlow::computePreferredLogicalWidths(); 186 if (!element() || !style().autoWrap() || !element()-> fastHasAttribute(nowrapAttr))186 if (!element() || !style().autoWrap() || !element()->hasAttributeWithoutSynchronization(nowrapAttr)) 187 187 return; 188 188 -
trunk/Source/WebCore/rendering/RenderThemeIOS.mm
r203326 r203337 626 626 // or a date input. We don't force these if this is just an element with 627 627 // "-webkit-appearance: menulist-button". 628 if (is<HTMLSelectElement>(*element) && !element-> fastHasAttribute(HTMLNames::multipleAttr))628 if (is<HTMLSelectElement>(*element) && !element->hasAttributeWithoutSynchronization(HTMLNames::multipleAttr)) 629 629 adjustSelectListButtonStyle(style, *element); 630 630 else if (is<HTMLInputElement>(*element)) -
trunk/Source/WebCore/rendering/SimpleLineLayout.cpp
r199156 r203337 299 299 SET_REASON_AND_RETURN_IF_NEEDED(FlowParentIsPlaceholderElement, reasons, includeReasons); 300 300 // FIXME: Implementation of wrap=hard looks into lineboxes. 301 if (flow.parent()->isTextArea() && flow.parent()->element()-> fastHasAttribute(HTMLNames::wrapAttr))301 if (flow.parent()->isTextArea() && flow.parent()->element()->hasAttributeWithoutSynchronization(HTMLNames::wrapAttr)) 302 302 SET_REASON_AND_RETURN_IF_NEEDED(FlowParentIsTextAreaWithWrapping, reasons, includeReasons); 303 303 // This currently covers <blockflow>#text</blockflow>, <blockflow>#text<br></blockflow> and mutiple (sibling) RenderText cases. -
trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp
r200540 r203337 216 216 if (!renderer) 217 217 continue; 218 if (!useElement. fastHasAttribute(SVGNames::clip_ruleAttr))218 if (!useElement.hasAttributeWithoutSynchronization(SVGNames::clip_ruleAttr)) 219 219 newClipRule = renderer->style().svgStyle().clipRule(); 220 220 } -
trunk/Source/WebCore/svg/SVGAnimateMotionElement.cpp
r194819 r203337 133 133 } 134 134 135 if (!foundMPath && fastHasAttribute(SVGNames::pathAttr))135 if (!foundMPath && hasAttributeWithoutSynchronization(SVGNames::pathAttr)) 136 136 m_animationPath = m_path; 137 137 -
trunk/Source/WebCore/svg/SVGAnimationElement.cpp
r203324 r203337 554 554 555 555 // These validations are appropriate for all animation modes. 556 if ( fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_keyTimes.size())556 if (hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_keyTimes.size()) 557 557 return; 558 558 … … 562 562 unsigned splinesCount = m_keySplines.size(); 563 563 if (!splinesCount 564 || ( fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() - 1 != splinesCount)564 || (hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) && m_keyPoints.size() - 1 != splinesCount) 565 565 || (animationMode == ValuesAnimation && m_values.size() - 1 != splinesCount) 566 || ( fastHasAttribute(SVGNames::keyTimesAttr) && m_keyTimes.size() - 1 != splinesCount))566 || (hasAttributeWithoutSynchronization(SVGNames::keyTimesAttr) && m_keyTimes.size() - 1 != splinesCount)) 567 567 return; 568 568 } … … 574 574 return; 575 575 if ((animationMode == FromToAnimation || animationMode == FromByAnimation || animationMode == ToAnimation || animationMode == ByAnimation) 576 && ( fastHasAttribute(SVGNames::keyPointsAttr) && fastHasAttribute(SVGNames::keyTimesAttr) && (m_keyTimes.size() < 2 || m_keyTimes.size() != m_keyPoints.size())))576 && (hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) && hasAttributeWithoutSynchronization(SVGNames::keyTimesAttr) && (m_keyTimes.size() < 2 || m_keyTimes.size() != m_keyPoints.size()))) 577 577 return; 578 578 if (animationMode == FromToAnimation) … … 588 588 else if (animationMode == ValuesAnimation) { 589 589 m_animationValid = m_values.size() >= 1 590 && (calcMode == CalcModePaced || ! fastHasAttribute(SVGNames::keyTimesAttr) || fastHasAttribute(SVGNames::keyPointsAttr) || (m_values.size() == m_keyTimes.size()))590 && (calcMode == CalcModePaced || !hasAttributeWithoutSynchronization(SVGNames::keyTimesAttr) || hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) || (m_values.size() == m_keyTimes.size())) 591 591 && (calcMode == CalcModeDiscrete || !m_keyTimes.size() || m_keyTimes.last() == 1) 592 592 && (calcMode != CalcModeSpline || ((m_keySplines.size() && (m_keySplines.size() == m_values.size() - 1)) || m_keySplines.size() == m_keyPoints.size() - 1)) 593 && (! fastHasAttribute(SVGNames::keyPointsAttr) || (m_keyTimes.size() > 1 && m_keyTimes.size() == m_keyPoints.size()));593 && (!hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) || (m_keyTimes.size() > 1 && m_keyTimes.size() == m_keyPoints.size())); 594 594 if (m_animationValid) 595 595 m_animationValid = calculateToAtEndOfDurationValue(m_values.last()); … … 597 597 calculateKeyTimesForCalcModePaced(); 598 598 } else if (animationMode == PathAnimation) 599 m_animationValid = calcMode == CalcModePaced || ! fastHasAttribute(SVGNames::keyPointsAttr) || (m_keyTimes.size() > 1 && m_keyTimes.size() == m_keyPoints.size());599 m_animationValid = calcMode == CalcModePaced || !hasAttributeWithoutSynchronization(SVGNames::keyPointsAttr) || (m_keyTimes.size() > 1 && m_keyTimes.size() == m_keyPoints.size()); 600 600 } 601 601 -
trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp
r203324 r203337 268 268 269 269 // "If no attribute is present, the default begin value (an offset-value of 0) must be evaluated." 270 if (! fastHasAttribute(SVGNames::beginAttr))270 if (!hasAttributeWithoutSynchronization(SVGNames::beginAttr)) 271 271 m_beginTimes.append(SMILTimeWithOrigin()); 272 272 -
trunk/Source/WebKit2/ChangeLog
r203335 r203337 1 2016-07-17 Ryosuke Niwa <rniwa@webkit.org> 2 3 Rename fastHasAttribute to hasAttributeWithoutSynchronization 4 https://bugs.webkit.org/show_bug.cgi?id=159864 5 6 Reviewed by Chris Dumez. 7 8 * WebProcess/WebPage/ios/WebPageIOS.mm: 9 (WebKit::WebPage::getAssistedNodeInformation): 10 1 11 2016-07-17 Jeremy Jones <jeremyj@apple.com> 2 12 -
trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
r203324 r203337 2560 2560 if (is<HTMLOptionElement>(*item)) { 2561 2561 HTMLOptionElement& option = downcast<HTMLOptionElement>(*item); 2562 information.selectOptions.append(OptionItem(option.text(), false, parentGroupID, option.selected(), option. fastHasAttribute(WebCore::HTMLNames::disabledAttr)));2562 information.selectOptions.append(OptionItem(option.text(), false, parentGroupID, option.selected(), option.hasAttributeWithoutSynchronization(WebCore::HTMLNames::disabledAttr))); 2563 2563 } else if (is<HTMLOptGroupElement>(*item)) { 2564 2564 HTMLOptGroupElement& group = downcast<HTMLOptGroupElement>(*item); 2565 2565 parentGroupID++; 2566 information.selectOptions.append(OptionItem(group.groupLabelText(), true, 0, false, group. fastHasAttribute(WebCore::HTMLNames::disabledAttr)));2566 information.selectOptions.append(OptionItem(group.groupLabelText(), true, 0, false, group.hasAttributeWithoutSynchronization(WebCore::HTMLNames::disabledAttr))); 2567 2567 } 2568 2568 }
Note: See TracChangeset
for help on using the changeset viewer.