[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 915e3128d6f7fbc5b964612b8e4e4595476b8446
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 03:12:10 2010 +0000

    2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Add a missing dependency.
            https://bugs.webkit.org/show_bug.cgi?id=43044
    
            * css/CSSPrimitiveValueMappings.h:
    2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Add access to the computed style display to WebAccessibilityObject.
            https://bugs.webkit.org/show_bug.cgi?id=43044
    
            * public/WebAccessibilityObject.h:
            * src/WebAccessibilityObject.cpp:
            (WebKit::WebAccessibilityObject::hasComputedStyle):
            (WebKit::WebAccessibilityObject::computedStyleDisplay):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64260 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e74cb6f..67337b5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add a missing dependency.
+        https://bugs.webkit.org/show_bug.cgi?id=43044
+
+        * css/CSSPrimitiveValueMappings.h:
+
 2010-07-28  Alex Nicolaou  <anicolao at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/WebCore/css/CSSPrimitiveValueMappings.h b/WebCore/css/CSSPrimitiveValueMappings.h
index 9533f68..b1d2d3d 100644
--- a/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/WebCore/css/CSSPrimitiveValueMappings.h
@@ -36,6 +36,7 @@
 #include "FontSmoothingMode.h"
 #include "GraphicsTypes.h"
 #include "Path.h"
+#include "RenderStyleConstants.h"
 #include "SVGRenderStyleDefs.h"
 #include "TextDirection.h"
 #include "TextRenderingMode.h"
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 489607d..2c720e1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-28  Dominic Mazzoni  <dmazzoni at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        Add access to the computed style display to WebAccessibilityObject.
+        https://bugs.webkit.org/show_bug.cgi?id=43044
+
+        * public/WebAccessibilityObject.h:
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::hasComputedStyle):
+        (WebKit::WebAccessibilityObject::computedStyleDisplay):
+
 2010-07-28  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/public/WebAccessibilityObject.h b/WebKit/chromium/public/WebAccessibilityObject.h
index fcf2480..ddb9bda 100644
--- a/WebKit/chromium/public/WebAccessibilityObject.h
+++ b/WebKit/chromium/public/WebAccessibilityObject.h
@@ -107,6 +107,8 @@ public:
 
     WEBKIT_API WebNode node() const;
     WEBKIT_API WebDocument document() const;
+    WEBKIT_API bool hasComputedStyle() const;
+    WEBKIT_API WebString computedStyleDisplay() const;
 
 #if WEBKIT_IMPLEMENTATION
     WebAccessibilityObject(const WTF::PassRefPtr<WebCore::AccessibilityObject>&);
diff --git a/WebKit/chromium/src/WebAccessibilityObject.cpp b/WebKit/chromium/src/WebAccessibilityObject.cpp
index 1b8fcf7..4263e8b 100644
--- a/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -32,11 +32,13 @@
 #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"
@@ -434,6 +436,36 @@ WebDocument WebAccessibilityObject::document() const
     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()))
 {

-- 
WebKit Debian packaging