Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: Source/web/WebAXObject.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/PopupMenuTest.cpp ('k') | Source/web/WebFormControlElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 22 matching lines...) Expand all
33 33
34 #include "core/HTMLNames.h" 34 #include "core/HTMLNames.h"
35 #include "core/css/CSSPrimitiveValueMappings.h" 35 #include "core/css/CSSPrimitiveValueMappings.h"
36 #include "core/dom/AXObjectCache.h" 36 #include "core/dom/AXObjectCache.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/Node.h" 38 #include "core/dom/Node.h"
39 #include "core/frame/FrameHost.h" 39 #include "core/frame/FrameHost.h"
40 #include "core/frame/FrameView.h" 40 #include "core/frame/FrameView.h"
41 #include "core/frame/PinchViewport.h" 41 #include "core/frame/PinchViewport.h"
42 #include "core/layout/LayoutView.h" 42 #include "core/layout/LayoutView.h"
43 #include "core/layout/style/LayoutStyle.h" 43 #include "core/layout/style/ComputedStyle.h"
44 #include "core/page/EventHandler.h" 44 #include "core/page/EventHandler.h"
45 #include "core/page/Page.h" 45 #include "core/page/Page.h"
46 #include "modules/accessibility/AXObject.h" 46 #include "modules/accessibility/AXObject.h"
47 #include "modules/accessibility/AXTable.h" 47 #include "modules/accessibility/AXTable.h"
48 #include "modules/accessibility/AXTableCell.h" 48 #include "modules/accessibility/AXTableCell.h"
49 #include "modules/accessibility/AXTableColumn.h" 49 #include "modules/accessibility/AXTableColumn.h"
50 #include "modules/accessibility/AXTableRow.h" 50 #include "modules/accessibility/AXTableRow.h"
51 #include "platform/PlatformKeyboardEvent.h" 51 #include "platform/PlatformKeyboardEvent.h"
52 #include "public/platform/WebPoint.h" 52 #include "public/platform/WebPoint.h"
53 #include "public/platform/WebRect.h" 53 #include "public/platform/WebRect.h"
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
974 return false; 974 return false;
975 975
976 Document* document = m_private->document(); 976 Document* document = m_private->document();
977 if (document) 977 if (document)
978 document->updateRenderTreeIfNeeded(); 978 document->updateRenderTreeIfNeeded();
979 979
980 Node* node = m_private->node(); 980 Node* node = m_private->node();
981 if (!node) 981 if (!node)
982 return false; 982 return false;
983 983
984 return node->computedStyle(); 984 return node->ensureComputedStyle();
985 } 985 }
986 986
987 WebString WebAXObject::computedStyleDisplay() const 987 WebString WebAXObject::computedStyleDisplay() const
988 { 988 {
989 if (isDetached()) 989 if (isDetached())
990 return WebString(); 990 return WebString();
991 991
992 Document* document = m_private->document(); 992 Document* document = m_private->document();
993 if (document) 993 if (document)
994 document->updateRenderTreeIfNeeded(); 994 document->updateRenderTreeIfNeeded();
995 995
996 Node* node = m_private->node(); 996 Node* node = m_private->node();
997 if (!node) 997 if (!node)
998 return WebString(); 998 return WebString();
999 999
1000 const LayoutStyle* layoutStyle = node->computedStyle(); 1000 const ComputedStyle* computedStyle = node->ensureComputedStyle();
1001 if (!layoutStyle) 1001 if (!computedStyle)
1002 return WebString(); 1002 return WebString();
1003 1003
1004 return WebString(CSSPrimitiveValue::create(layoutStyle->display())->getStrin gValue()); 1004 return WebString(CSSPrimitiveValue::create(computedStyle->display())->getStr ingValue());
1005 } 1005 }
1006 1006
1007 bool WebAXObject::accessibilityIsIgnored() const 1007 bool WebAXObject::accessibilityIsIgnored() const
1008 { 1008 {
1009 if (isDetached()) 1009 if (isDetached())
1010 return false; 1010 return false;
1011 1011
1012 return m_private->accessibilityIsIgnored(); 1012 return m_private->accessibilityIsIgnored();
1013 } 1013 }
1014 1014
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
1333 m_private = object; 1333 m_private = object;
1334 return *this; 1334 return *this;
1335 } 1335 }
1336 1336
1337 WebAXObject::operator WTF::PassRefPtr<AXObject>() const 1337 WebAXObject::operator WTF::PassRefPtr<AXObject>() const
1338 { 1338 {
1339 return m_private.get(); 1339 return m_private.get();
1340 } 1340 }
1341 1341
1342 } // namespace blink 1342 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/PopupMenuTest.cpp ('k') | Source/web/WebFormControlElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698