Diff
Modified: trunk/Source/WebCore/ChangeLog (151948 => 151949)
--- trunk/Source/WebCore/ChangeLog 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/ChangeLog 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1,3 +1,56 @@
+2013-06-24 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLFormElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117937
+
+ Reviewed by Andreas Kling.
+
+ This refers to http://src.chromium.org/viewvc/blink?view=revision&revision=152859
+
+ To enhance readibility, this patch adopts is/toHTMLFormElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * bindings/js/JSDOMFormDataCustom.cpp:
+ (WebCore::toHTMLFormElement):
+ * bindings/js/JSHTMLFormElementCustom.cpp:
+ (WebCore::JSHTMLFormElement::nameGetter):
+ * editing/FrameSelection.cpp:
+ (WebCore::scanForForm):
+ (WebCore::FrameSelection::currentForm):
+ * editing/InsertParagraphSeparatorCommand.cpp:
+ (WebCore::InsertParagraphSeparatorCommand::doApply):
+ * html/FormAssociatedElement.cpp:
+ (WebCore::FormAssociatedElement::findAssociatedForm):
+ * html/HTMLElement.cpp:
+ (WebCore::HTMLElement::findFormAncestor):
+ * html/HTMLFormControlsCollection.cpp:
+ (WebCore::HTMLFormControlsCollection::HTMLFormControlsCollection):
+ (WebCore::HTMLFormControlsCollection::formControlElements):
+ (WebCore::HTMLFormControlsCollection::formImageElements):
+ (WebCore::HTMLFormControlsCollection::updateNameCache):
+ * html/HTMLFormElement.h:
+ (WebCore::isHTMLFormElement):
+ (WebCore::toHTMLFormElement):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::insertedInto):
+ * html/HTMLNameCollection.cpp:
+ (WebCore::WindowNameCollection::nodeMatchesIfNameAttributeMatch):
+ (WebCore::DocumentNameCollection::nodeMatchesIfNameAttributeMatch):
+ (WebCore::DocumentNameCollection::nodeMatches):
+ * html/RadioInputType.cpp:
+ (WebCore::RadioInputType::handleKeydownEvent):
+ * html/RadioNodeList.cpp:
+ (WebCore::RadioNodeList::RadioNodeList):
+ (WebCore::RadioNodeList::checkElementMatchesRadioNodeListFilter):
+ * html/parser/HTMLConstructionSite.cpp:
+ (WebCore::HTMLConstructionSite::insertHTMLFormElement):
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::closestFormAncestor):
+ * page/Frame.cpp:
+ (WebCore::Frame::searchForLabelsBeforeElement):
+
2013-06-24 Gyuyoung Kim <[email protected]>
Remove unneeded include header files from WebCore
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (151948 => 151949)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -2557,7 +2557,7 @@
if (node && node->hasTagName(divTag))
return DivRole;
- if (node && node->hasTagName(formTag))
+ if (node && isHTMLFormElement(node))
return FormRole;
if (node && node->hasTagName(articleTag))
Modified: trunk/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp (151948 => 151949)
--- trunk/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/bindings/js/JSDOMFormDataCustom.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -43,7 +43,7 @@
static HTMLFormElement* toHTMLFormElement(JSC::JSValue value)
{
- return value.inherits(&JSHTMLFormElement::s_info) ? static_cast<HTMLFormElement*>(jsCast<JSHTMLFormElement*>(asObject(value))->impl()) : 0;
+ return value.inherits(&JSHTMLFormElement::s_info) ? toHTMLFormElement(jsCast<JSHTMLFormElement*>(asObject(value))->impl()) : 0;
}
EncodedJSValue JSC_HOST_CALL JSDOMFormDataConstructor::constructJSDOMFormData(ExecState* exec)
Modified: trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp (151948 => 151949)
--- trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/bindings/js/JSHTMLFormElementCustom.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -47,7 +47,7 @@
JSValue JSHTMLFormElement::nameGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
{
JSHTMLElement* jsForm = jsCast<JSHTMLFormElement*>(asObject(slotBase));
- HTMLFormElement* form = static_cast<HTMLFormElement*>(jsForm->impl());
+ HTMLFormElement* form = toHTMLFormElement(jsForm->impl());
Vector<RefPtr<Node> > namedItems;
form->getNamedElements(propertyNameToAtomicString(propertyName), namedItems);
Modified: trunk/Source/WebCore/editing/FrameSelection.cpp (151948 => 151949)
--- trunk/Source/WebCore/editing/FrameSelection.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/editing/FrameSelection.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1969,8 +1969,8 @@
return 0;
Element* element = start->isElementNode() ? toElement(start) : ElementTraversal::next(start);
for (; element; element = ElementTraversal::next(element)) {
- if (element->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(element);
+ if (isHTMLFormElement(element))
+ return toHTMLFormElement(element);
if (element->isHTMLElement() && toHTMLElement(element)->isFormControlElement())
return static_cast<HTMLFormControlElement*>(element)->form();
if (element->hasTagName(frameTag) || element->hasTagName(iframeTag)) {
@@ -1993,8 +1993,8 @@
// Try walking up the node tree to find a form element.
Node* node;
for (node = start; node; node = node->parentNode()) {
- if (node->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(node);
+ if (isHTMLFormElement(node))
+ return toHTMLFormElement(node);
if (node->isHTMLElement() && toHTMLElement(node)->isFormControlElement())
return static_cast<HTMLFormControlElement*>(node)->form();
}
Modified: trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp (151948 => 151949)
--- trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/editing/InsertParagraphSeparatorCommand.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -30,6 +30,7 @@
#include "Document.h"
#include "EditingStyle.h"
#include "HTMLElement.h"
+#include "HTMLFormElement.h"
#include "HTMLNames.h"
#include "InsertLineBreakCommand.h"
#include "NodeTraversal.h"
@@ -169,7 +170,7 @@
if (!startBlock
|| !startBlock->nonShadowBoundaryParentNode()
|| isTableCell(startBlock.get())
- || startBlock->hasTagName(formTag)
+ || isHTMLFormElement(startBlock.get())
// FIXME: If the node is hidden, we don't have a canonical position so we will do the wrong thing for tables and <hr>. https://bugs.webkit.org/show_bug.cgi?id=40342
|| (!canonicalPos.isNull() && canonicalPos.deprecatedNode()->renderer() && canonicalPos.deprecatedNode()->renderer()->isTable())
|| (!canonicalPos.isNull() && canonicalPos.deprecatedNode()->hasTagName(hrTag))) {
Modified: trunk/Source/WebCore/html/FormAssociatedElement.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/FormAssociatedElement.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/FormAssociatedElement.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -108,8 +108,8 @@
// treeScope()->getElementById() over the given element.
HTMLFormElement* newForm = 0;
Element* newFormCandidate = element->treeScope()->getElementById(formId);
- if (newFormCandidate && newFormCandidate->hasTagName(formTag))
- newForm = static_cast<HTMLFormElement*>(newFormCandidate);
+ if (newFormCandidate && isHTMLFormElement(newFormCandidate))
+ newForm = toHTMLFormElement(newFormCandidate);
return newForm;
}
Modified: trunk/Source/WebCore/html/HTMLElement.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/HTMLElement.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/HTMLElement.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -786,8 +786,8 @@
HTMLFormElement* HTMLElement::findFormAncestor() const
{
for (ContainerNode* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) {
- if (ancestor->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(ancestor);
+ if (isHTMLFormElement(ancestor))
+ return toHTMLFormElement(ancestor);
}
return 0;
}
Modified: trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/HTMLFormControlsCollection.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -39,7 +39,7 @@
HTMLFormControlsCollection::HTMLFormControlsCollection(Node* ownerNode)
: HTMLCollection(ownerNode, FormControls, OverridesItemAfter)
{
- ASSERT(ownerNode->hasTagName(formTag) || ownerNode->hasTagName(fieldsetTag));
+ ASSERT(isHTMLFormElement(ownerNode) || ownerNode->hasTagName(fieldsetTag));
}
PassRefPtr<HTMLFormControlsCollection> HTMLFormControlsCollection::create(Node* ownerNode, CollectionType)
@@ -54,17 +54,17 @@
const Vector<FormAssociatedElement*>& HTMLFormControlsCollection::formControlElements() const
{
ASSERT(ownerNode());
- ASSERT(ownerNode()->hasTagName(formTag) || ownerNode()->hasTagName(fieldsetTag));
- if (ownerNode()->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(ownerNode())->associatedElements();
+ ASSERT(isHTMLFormElement(ownerNode()) || ownerNode()->hasTagName(fieldsetTag));
+ if (isHTMLFormElement(ownerNode()))
+ return toHTMLFormElement(ownerNode())->associatedElements();
return static_cast<HTMLFieldSetElement*>(ownerNode())->associatedElements();
}
const Vector<HTMLImageElement*>& HTMLFormControlsCollection::formImageElements() const
{
ASSERT(ownerNode());
- ASSERT(ownerNode()->hasTagName(formTag));
- return static_cast<HTMLFormElement*>(ownerNode())->imageElements();
+ ASSERT(isHTMLFormElement(ownerNode()));
+ return toHTMLFormElement(ownerNode())->imageElements();
}
Element* HTMLFormControlsCollection::virtualItemAfter(unsigned& offset, Element* previousItem) const
@@ -144,7 +144,7 @@
}
}
- if (ownerNode()->hasTagName(formTag)) {
+ if (isHTMLFormElement(ownerNode())) {
const Vector<HTMLImageElement*>& imageElementsArray = formImageElements();
for (unsigned i = 0; i < imageElementsArray.size(); ++i) {
HTMLImageElement* element = imageElementsArray[i];
Modified: trunk/Source/WebCore/html/HTMLFormElement.h (151948 => 151949)
--- trunk/Source/WebCore/html/HTMLFormElement.h 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/HTMLFormElement.h 2013-06-25 02:19:53 UTC (rev 151949)
@@ -161,6 +161,17 @@
bool m_wasDemoted;
};
+inline bool isHTMLFormElement(Node* node)
+{
+ return node->hasTagName(HTMLNames::formTag);
+}
+
+inline HTMLFormElement* toHTMLFormElement(Node* node)
+{
+ ASSERT_WITH_SECURITY_IMPLICATION(!node || isHTMLFormElement(node));
+ return static_cast<HTMLFormElement*>(node);
+}
+
} // namespace WebCore
#endif // HTMLFormElement_h
Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -195,8 +195,8 @@
if (!m_form) {
// m_form can be non-null if it was set in constructor.
for (ContainerNode* ancestor = parentNode(); ancestor; ancestor = ancestor->parentNode()) {
- if (ancestor->hasTagName(formTag)) {
- m_form = static_cast<HTMLFormElement*>(ancestor);
+ if (isHTMLFormElement(ancestor)) {
+ m_form = toHTMLFormElement(ancestor);
m_form->registerImgElement(this);
break;
}
Modified: trunk/Source/WebCore/html/HTMLNameCollection.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/HTMLNameCollection.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/HTMLNameCollection.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -25,6 +25,7 @@
#include "Element.h"
#include "HTMLDocument.h"
+#include "HTMLFormElement.h"
#include "HTMLNames.h"
#include "HTMLObjectElement.h"
#include "NodeRareData.h"
@@ -51,7 +52,7 @@
bool WindowNameCollection::nodeMatchesIfNameAttributeMatch(Element* element)
{
- return element->hasTagName(imgTag) || element->hasTagName(formTag) || element->hasTagName(appletTag)
+ return element->hasTagName(imgTag) || isHTMLFormElement(element) || element->hasTagName(appletTag)
|| element->hasTagName(embedTag) || element->hasTagName(objectTag);
}
@@ -72,7 +73,7 @@
bool DocumentNameCollection::nodeMatchesIfNameAttributeMatch(Element* element)
{
- return element->hasTagName(formTag) || element->hasTagName(embedTag) || element->hasTagName(iframeTag)
+ return isHTMLFormElement(element) || element->hasTagName(embedTag) || element->hasTagName(iframeTag)
|| element->hasTagName(appletTag) || (element->hasTagName(objectTag) && toHTMLObjectElement(element)->isDocNamedItem())
|| element->hasTagName(imgTag);
}
@@ -81,7 +82,7 @@
{
// Find images, forms, applets, embeds, objects and iframes by name, applets and object by id, and images by id
// but only if they have a name attribute (this very strange rule matches IE)
- if (element->hasTagName(formTag) || element->hasTagName(embedTag) || element->hasTagName(iframeTag))
+ if (isHTMLFormElement(element) || element->hasTagName(embedTag) || element->hasTagName(iframeTag))
return element->getNameAttribute() == name;
if (element->hasTagName(appletTag))
return element->getNameAttribute() == name || element->getIdAttribute() == name;
Modified: trunk/Source/WebCore/html/RadioInputType.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/RadioInputType.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/RadioInputType.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -23,6 +23,7 @@
#include "RadioInputType.h"
#include "Frame.h"
+#include "HTMLFormElement.h"
#include "HTMLInputElement.h"
#include "HTMLNames.h"
#include "InputTypeNames.h"
@@ -87,7 +88,7 @@
Node* node = element();
while ((node = (forward ? NodeTraversal::next(node) : NodeTraversal::previous(node)))) {
// Once we encounter a form element, we know we're through.
- if (node->hasTagName(formTag))
+ if (isHTMLFormElement(node))
break;
// Look for more radio buttons.
if (!node->hasTagName(inputTag))
Modified: trunk/Source/WebCore/html/RadioNodeList.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/RadioNodeList.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/RadioNodeList.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -38,7 +38,7 @@
using namespace HTMLNames;
RadioNodeList::RadioNodeList(Node* rootNode, const AtomicString& name)
- : LiveNodeList(rootNode, RadioNodeListType, InvalidateForFormControls, rootNode->hasTagName(formTag) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
+ : LiveNodeList(rootNode, RadioNodeListType, InvalidateForFormControls, isHTMLFormElement(rootNode) ? NodeListIsRootedAtDocument : NodeListIsRootedAtNode)
, m_name(name)
{
}
@@ -84,7 +84,7 @@
bool RadioNodeList::checkElementMatchesRadioNodeListFilter(Element* testElement) const
{
ASSERT(testElement->hasTagName(objectTag) || testElement->isFormControlElement());
- if (ownerNode()->hasTagName(formTag)) {
+ if (isHTMLFormElement(ownerNode())) {
HTMLFormElement* formElement = 0;
if (testElement->hasTagName(objectTag))
formElement = static_cast<HTMLObjectElement*>(testElement)->form();
Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -411,7 +411,7 @@
void HTMLConstructionSite::insertHTMLFormElement(AtomicHTMLToken* token, bool isDemoted)
{
RefPtr<Element> element = createHTMLElement(token);
- ASSERT(element->hasTagName(formTag));
+ ASSERT(isHTMLFormElement(element.get()));
m_form = static_pointer_cast<HTMLFormElement>(element.release());
m_form->setDemoted(isDemoted);
attachLater(currentNode(), m_form);
Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (151948 => 151949)
--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -137,8 +137,8 @@
{
ASSERT(isMainThread());
while (element) {
- if (element->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(element);
+ if (isHTMLFormElement(element))
+ return toHTMLFormElement(element);
ContainerNode* parent = element->parentNode();
if (!parent || !parent->isElementNode())
return 0;
Modified: trunk/Source/WebCore/page/Frame.cpp (151948 => 151949)
--- trunk/Source/WebCore/page/Frame.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebCore/page/Frame.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -414,12 +414,11 @@
int unsigned lengthSearched = 0;
Node* n;
for (n = NodeTraversal::previous(element); n && lengthSearched < charsSearchedThreshold; n = NodeTraversal::previous(n)) {
- if (n->hasTagName(formTag)
- || (n->isHTMLElement() && toElement(n)->isFormControlElement()))
- {
- // We hit another form element or the start of the form - bail out
+ // We hit another form element or the start of the form - bail out
+ if (isHTMLFormElement(n) || (n->isHTMLElement() && toElement(n)->isFormControlElement()))
break;
- } else if (n->hasTagName(tdTag) && !startingTableCell) {
+
+ if (n->hasTagName(tdTag) && !startingTableCell) {
startingTableCell = static_cast<HTMLTableCellElement*>(n);
} else if (n->hasTagName(trTag) && startingTableCell) {
String result = searchForLabelsAboveCell(regExp.get(), startingTableCell, resultDistance);
Modified: trunk/Source/WebKit/blackberry/ChangeLog (151948 => 151949)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1,3 +1,18 @@
+2013-06-24 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLFormElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117937
+
+ Reviewed by Andreas Kling.
+
+ This refers to http://src.chromium.org/viewvc/blink?view=revision&revision=152859
+
+ To enhance readibility, this patch adopts is/toHTMLFormElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * WebCoreSupport/CredentialManager.cpp:
+ (WebCore::CredentialManager::autofillPasswordForms):
+
2013-06-24 Jakob Petsovits <[email protected]>
[BlackBerry] Only resume root layer commits for visible WebPages
Modified: trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.cpp (151948 => 151949)
--- trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/blackberry/WebCoreSupport/CredentialManager.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -59,7 +59,7 @@
for (size_t i = 0; i < sourceLength; ++i) {
Node* node = forms->item(i);
if (node && node->isHTMLElement()) {
- CredentialTransformData data(static_cast<HTMLFormElement*>(node));
+ CredentialTransformData data(toHTMLFormElement(node));
if (!data.isValid() || !credentialBackingStore().hasLogin(data.protectionSpace()))
continue;
Credential savedCredential = credentialBackingStore().getLogin(data.protectionSpace());
Modified: trunk/Source/WebKit/win/ChangeLog (151948 => 151949)
--- trunk/Source/WebKit/win/ChangeLog 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/win/ChangeLog 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1,3 +1,23 @@
+2013-06-24 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLFormElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117937
+
+ Reviewed by Andreas Kling.
+
+ This refers to http://src.chromium.org/viewvc/blink?view=revision&revision=152859
+
+ To enhance readibility, this patch adopts is/toHTMLFormElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * DOMCoreClasses.cpp:
+ (DOMElement::createInstance):
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLFormElement::action):
+ (DOMHTMLFormElement::method):
+ * WebFrame.cpp:
+ (formElementFromDOMElement):
+
2013-06-20 Brent Fulgham <[email protected]>
[Windows] AX: Radio buttons with "tab" role should describe themselves as tabs.
Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (151948 => 151949)
--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1494,7 +1494,7 @@
HRESULT hr;
IDOMElement* domElement = 0;
- if (e->hasTagName(formTag)) {
+ if (isHTMLFormElement(e)) {
DOMHTMLFormElement* newElement = new DOMHTMLFormElement(e);
hr = newElement->QueryInterface(IID_IDOMElement, (void**)&domElement);
} else if (e->hasTagName(iframeTag)) {
Modified: trunk/Source/WebKit/win/DOMHTMLClasses.cpp (151948 => 151949)
--- trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -559,8 +559,8 @@
HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::action(
/* [retval][out] */ BSTR* result)
{
- ASSERT(m_element && m_element->hasTagName(formTag));
- WTF::String actionString = static_cast<HTMLFormElement*>(m_element)->action();
+ ASSERT(m_element && isHTMLFormElement(m_element));
+ WTF::String actionString = toHTMLFormElement(m_element)->action();
*result = BString(actionString.characters(), actionString.length()).release();
return S_OK;
}
@@ -589,8 +589,8 @@
HRESULT STDMETHODCALLTYPE DOMHTMLFormElement::method(
/* [retval][out] */ BSTR* result)
{
- ASSERT(m_element && m_element->hasTagName(formTag));
- WTF::String methodString = static_cast<HTMLFormElement*>(m_element)->method();
+ ASSERT(m_element && isHTMLFormElement(m_element));
+ WTF::String methodString = toHTMLFormElement(m_element)->method();
*result = BString(methodString.characters(), methodString.length()).release();
return S_OK;
}
Modified: trunk/Source/WebKit/win/WebFrame.cpp (151948 => 151949)
--- trunk/Source/WebKit/win/WebFrame.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -204,8 +204,8 @@
Element* ele;
hr = elePriv->coreElement((void**)&ele);
elePriv->Release();
- if (SUCCEEDED(hr) && ele && ele->hasTagName(formTag))
- return static_cast<HTMLFormElement*>(ele);
+ if (SUCCEEDED(hr) && ele && isHTMLFormElement(ele))
+ return toHTMLFormElement(ele);
}
return 0;
}
Modified: trunk/Source/WebKit2/ChangeLog (151948 => 151949)
--- trunk/Source/WebKit2/ChangeLog 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit2/ChangeLog 2013-06-25 02:19:53 UTC (rev 151949)
@@ -1,3 +1,18 @@
+2013-06-24 Kangil Han <[email protected]>
+
+ Adopt is/toHTMLFormElement for code cleanup
+ https://bugs.webkit.org/show_bug.cgi?id=117937
+
+ Reviewed by Andreas Kling.
+
+ This refers to http://src.chromium.org/viewvc/blink?view=revision&revision=152859
+
+ To enhance readibility, this patch adopts is/toHTMLFormElement.
+ This also helps out to reduce duplicated use of static_cast.
+
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::containsAnyFormElements):
+
2013-06-24 Simon Cooper <[email protected]>
deny file-read-data /Library/CoreMediaIO/Plug-Ins/DAL
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (151948 => 151949)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-06-25 01:44:39 UTC (rev 151948)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2013-06-25 02:19:53 UTC (rev 151949)
@@ -48,6 +48,7 @@
#include <WebCore/EventHandler.h>
#include <WebCore/Frame.h>
#include <WebCore/FrameView.h>
+#include <WebCore/HTMLFormElement.h>
#include <WebCore/HTMLFrameOwnerElement.h>
#include <WebCore/HTMLNames.h>
#include <WebCore/JSCSSStyleDeclaration.h>
@@ -597,7 +598,7 @@
for (Node* node = document->documentElement(); node; node = NodeTraversal::next(node)) {
if (!node->isElementNode())
continue;
- if (toElement(node)->hasTagName(HTMLNames::formTag))
+ if (isHTMLFormElement(node))
return true;
}
return false;
