Merge WebKit at r64264 : Initial merge by git.

Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1

1 files changed, 65 insertions, 0 deletions

diff --git a/WebKit/chromium/src/WebAccessibilityObject.cpp b/WebKit/chromium/src/WebAccessibilityObject.cpp
index e59a1a2..4263e8b 100644
--- a/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -32,9 +32,15 @@
 #include "WebAccessibilityObject.h"
 
 #include "AccessibilityObject.h"
+#include "CSSPrimitiveValueMappings.h"
+#include "Document.h"
 #include "EventHandler.h"
 #include "FrameView.h"
+#include "Node.h"
 #include "PlatformKeyboardEvent.h"
+#include "RenderStyle.h"
+#include "WebDocument.h"
+#include "WebNode.h"
 #include "WebPoint.h"
 #include "WebRect.h"
 #include "WebString.h"
@@ -401,6 +407,65 @@ WebString WebAccessibilityObject::title() const
     return m_private->title();
 }
 
+
+WebNode WebAccessibilityObject::node() const
+{
+    if (!m_private)
+        return WebNode();
+
+    m_private->updateBackingStore();
+
+    Node* node = m_private->node();
+    if (!node)
+        return WebNode();
+
+    return WebNode(node);
+}
+
+WebDocument WebAccessibilityObject::document() const
+{
+    if (!m_private)
+        return WebDocument();
+
+    m_private->updateBackingStore();
+
+    Document* document = m_private->document();
+    if (!document)
+        return WebDocument();
+
+    return WebDocument(document);
+}
+
+bool WebAccessibilityObject::hasComputedStyle() const
+{
+    Document* document = m_private->document();
+    if (document)
+        document->updateStyleIfNeeded();
+
+    Node* node = m_private->node();
+    if (!node)
+        return false;
+
+    return node->computedStyle();
+}
+
+WebString WebAccessibilityObject::computedStyleDisplay() const
+{
+    Document* document = m_private->document();
+    if (document)
+        document->updateStyleIfNeeded();
+
+    Node* node = m_private->node();
+    if (!node)
+        return WebString();
+
+    RenderStyle* renderStyle = node->computedStyle();
+    if (!renderStyle)
+        return WebString();
+
+    return WebString(CSSPrimitiveValue::create(renderStyle->display())->getStringValue());
+}
+
 WebAccessibilityObject::WebAccessibilityObject(const WTF::PassRefPtr<WebCore::AccessibilityObject>& object)
     : m_private(static_cast<WebAccessibilityObjectPrivate*>(object.releaseRef()))
 {