tizen beta release

[framework/web/webkit-efl.git] / Source / WebKit / chromium / src / WebAccessibilityObject.cpp

diff --git a/Source/WebKit/chromium/src/WebAccessibilityObject.cpp b/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
index 279afee..a9ab317 100755 (executable)
--- a/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
+++ b/Source/WebKit/chromium/src/WebAccessibilityObject.cpp
@@ -397,6 +397,15 @@ bool WebAccessibilityObject::isSelected() const
     return m_private->isSelected();
 }
 
+bool WebAccessibilityObject::isSelectedOptionActive() const
+{
+    if (m_private.isNull())
+        return false;
+
+    m_private->updateBackingStore();
+    return m_private->isSelectedOptionActive();
+}
+
 bool WebAccessibilityObject::isVertical() const
 {
     if (m_private.isNull())
@@ -532,7 +541,7 @@ WebAccessibilityObject WebAccessibilityObject::hitTest(const WebPoint& point) co
     IntPoint contentsPoint = m_private->documentFrameView()->windowToContents(point);
     RefPtr<AccessibilityObject> hit = m_private->accessibilityHitTest(contentsPoint);
 
-    if (hit.get())
+    if (hit)
         return WebAccessibilityObject(hit);
 
     if (m_private->boundingBoxRect().contains(contentsPoint))
@@ -551,7 +560,7 @@ WebString WebAccessibilityObject::keyboardShortcut() const
     if (accessKey.isNull())
         return WebString();
 
-    static String modifierString;
+    DEFINE_STATIC_LOCAL(String, modifierString, ());
     if (modifierString.isNull()) {
         unsigned modifiers = EventHandler::accessKeyModifiers();
         // Follow the same order as Mozilla MSAA implementation:
@@ -771,7 +780,7 @@ bool WebAccessibilityObject::lineBreaks(WebVector<int>& result) const
 
     VisiblePosition pos = m_private->visiblePositionForIndex(textLength);
     int lineBreakCount = m_private->lineForPosition(pos);
-    if (!lineBreakCount)
+    if (lineBreakCount <= 0)
         return false;
 
     WebVector<int> lineBreaks(static_cast<size_t>(lineBreakCount));