Merge WebKit at r59636: Initial merge by git

Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91

2 files changed, 4 insertions, 2 deletions

diff --git a/WebCore/accessibility/AccessibilityRenderObject.cpp b/WebCore/accessibility/AccessibilityRenderObject.cpp
index 071bf5d..785ee31 100644
--- a/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -1240,7 +1240,7 @@ static HTMLLabelElement* labelForElement(Element* element)
     for (unsigned i = 0; i < len; i++) {
         if (list->item(i)->hasTagName(labelTag)) {
             HTMLLabelElement* label = static_cast<HTMLLabelElement*>(list->item(i));
-            if (label->correspondingControl() == element)
+            if (label->control() == element)
                 return label;
         }
     }
@@ -2845,7 +2845,7 @@ AccessibilityObject* AccessibilityRenderObject::correspondingControlForLabelElem
     if (!labelElement)
         return 0;
     
-    HTMLElement* correspondingControl = labelElement->correspondingControl();
+    HTMLElement* correspondingControl = labelElement->control();
     if (!correspondingControl)
         return 0;
     
diff --git a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
index d09877f..5158774 100644
--- a/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
+++ b/WebCore/accessibility/gtk/AccessibilityObjectWrapperAtk.cpp
@@ -328,6 +328,8 @@ static AtkAttributeSet* webkit_accessible_get_attributes(AtkObject* object)
 {
     AtkAttributeSet* attributeSet = 0;
 
+    attributeSet = addAttributeToSet(attributeSet, "toolkit", "WebKitGtk");
+
     int headingLevel = core(object)->headingLevel();
     if (headingLevel) {
         String value = String::number(headingLevel);