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

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

Issue 211773002: Rename updateStyle to updateRenderTree (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix tracing test Created 6 years, 9 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/core/xml/XMLErrors.cpp ('k') | no next file » | 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 843 matching lines...) Expand 10 before | Expand all | Expand 10 after
854 return WebDocument(document); 854 return WebDocument(document);
855 } 855 }
856 856
857 bool WebAXObject::hasComputedStyle() const 857 bool WebAXObject::hasComputedStyle() const
858 { 858 {
859 if (isDetached()) 859 if (isDetached())
860 return false; 860 return false;
861 861
862 Document* document = m_private->document(); 862 Document* document = m_private->document();
863 if (document) 863 if (document)
864 document->updateStyleIfNeeded(); 864 document->updateRenderTreeIfNeeded();
865 865
866 Node* node = m_private->node(); 866 Node* node = m_private->node();
867 if (!node) 867 if (!node)
868 return false; 868 return false;
869 869
870 return node->computedStyle(); 870 return node->computedStyle();
871 } 871 }
872 872
873 WebString WebAXObject::computedStyleDisplay() const 873 WebString WebAXObject::computedStyleDisplay() const
874 { 874 {
875 if (isDetached()) 875 if (isDetached())
876 return WebString(); 876 return WebString();
877 877
878 Document* document = m_private->document(); 878 Document* document = m_private->document();
879 if (document) 879 if (document)
880 document->updateStyleIfNeeded(); 880 document->updateRenderTreeIfNeeded();
881 881
882 Node* node = m_private->node(); 882 Node* node = m_private->node();
883 if (!node) 883 if (!node)
884 return WebString(); 884 return WebString();
885 885
886 RenderStyle* renderStyle = node->computedStyle(); 886 RenderStyle* renderStyle = node->computedStyle();
887 if (!renderStyle) 887 if (!renderStyle)
888 return WebString(); 888 return WebString();
889 889
890 return WebString(CSSPrimitiveValue::create(renderStyle->display())->getStrin gValue()); 890 return WebString(CSSPrimitiveValue::create(renderStyle->display())->getStrin gValue());
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 m_private = object; 1155 m_private = object;
1156 return *this; 1156 return *this;
1157 } 1157 }
1158 1158
1159 WebAXObject::operator WTF::PassRefPtr<WebCore::AXObject>() const 1159 WebAXObject::operator WTF::PassRefPtr<WebCore::AXObject>() const
1160 { 1160 {
1161 return m_private.get(); 1161 return m_private.get();
1162 } 1162 }
1163 1163
1164 } // namespace blink 1164 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/xml/XMLErrors.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698