OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 13 matching lines...) Expand all Loading... | |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "public/web/WebAXObject.h" | 32 #include "public/web/WebAXObject.h" |
33 | 33 |
34 #include "core/CSSValueKeywords.h" | |
34 #include "core/HTMLNames.h" | 35 #include "core/HTMLNames.h" |
35 #include "core/css/CSSPrimitiveValueMappings.h" | 36 #include "core/css/CSSPrimitiveValueMappings.h" |
36 #include "core/dom/Document.h" | 37 #include "core/dom/Document.h" |
37 #include "core/dom/Node.h" | 38 #include "core/dom/Node.h" |
38 #include "core/frame/FrameHost.h" | 39 #include "core/frame/FrameHost.h" |
39 #include "core/frame/FrameView.h" | 40 #include "core/frame/FrameView.h" |
40 #include "core/frame/VisualViewport.h" | 41 #include "core/frame/VisualViewport.h" |
41 #include "core/input/EventHandler.h" | 42 #include "core/input/EventHandler.h" |
42 #include "core/layout/LayoutView.h" | 43 #include "core/layout/LayoutView.h" |
43 #include "core/style/ComputedStyle.h" | 44 #include "core/style/ComputedStyle.h" |
(...skipping 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1232 document->updateLayoutTreeIfNeeded(); | 1233 document->updateLayoutTreeIfNeeded(); |
1233 | 1234 |
1234 Node* node = m_private->node(); | 1235 Node* node = m_private->node(); |
1235 if (!node) | 1236 if (!node) |
1236 return WebString(); | 1237 return WebString(); |
1237 | 1238 |
1238 const ComputedStyle* computedStyle = node->ensureComputedStyle(); | 1239 const ComputedStyle* computedStyle = node->ensureComputedStyle(); |
1239 if (!computedStyle) | 1240 if (!computedStyle) |
1240 return WebString(); | 1241 return WebString(); |
1241 | 1242 |
1242 return WebString(CSSPrimitiveValue::create(computedStyle->display())->getStr ingValue()); | 1243 return WebString(String(getValueName(CSSPrimitiveValue::create(computedStyle ->display())->getValueID()))); |
Timothy Loh
2015/08/27 01:30:09
->cssText()?
sashab
2015/08/27 06:30:16
This whole creation of CSSPrimitiveValue isn't act
| |
1243 } | 1244 } |
1244 | 1245 |
1245 bool WebAXObject::accessibilityIsIgnored() const | 1246 bool WebAXObject::accessibilityIsIgnored() const |
1246 { | 1247 { |
1247 if (isDetached()) | 1248 if (isDetached()) |
1248 return false; | 1249 return false; |
1249 | 1250 |
1250 return m_private->accessibilityIsIgnored(); | 1251 return m_private->accessibilityIsIgnored(); |
1251 } | 1252 } |
1252 | 1253 |
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1613 m_private = object; | 1614 m_private = object; |
1614 return *this; | 1615 return *this; |
1615 } | 1616 } |
1616 | 1617 |
1617 WebAXObject::operator PassRefPtrWillBeRawPtr<AXObject>() const | 1618 WebAXObject::operator PassRefPtrWillBeRawPtr<AXObject>() const |
1618 { | 1619 { |
1619 return m_private.get(); | 1620 return m_private.get(); |
1620 } | 1621 } |
1621 | 1622 |
1622 } // namespace blink | 1623 } // namespace blink |
OLD | NEW |