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

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

Issue 1896793002: Rename (updateLayout/updateStyle).*.() to updateStyleAndLayout.*.() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
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 1101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1112 return WebDocument(document); 1112 return WebDocument(document);
1113 } 1113 }
1114 1114
1115 bool WebAXObject::hasComputedStyle() const 1115 bool WebAXObject::hasComputedStyle() const
1116 { 1116 {
1117 if (isDetached()) 1117 if (isDetached())
1118 return false; 1118 return false;
1119 1119
1120 Document* document = m_private->getDocument(); 1120 Document* document = m_private->getDocument();
1121 if (document) 1121 if (document)
1122 document->updateLayoutTree(); 1122 document->updateStyleAndLayoutTree();
1123 1123
1124 Node* node = m_private->getNode(); 1124 Node* node = m_private->getNode();
1125 if (!node) 1125 if (!node)
1126 return false; 1126 return false;
1127 1127
1128 return node->ensureComputedStyle(); 1128 return node->ensureComputedStyle();
1129 } 1129 }
1130 1130
1131 WebString WebAXObject::computedStyleDisplay() const 1131 WebString WebAXObject::computedStyleDisplay() const
1132 { 1132 {
1133 if (isDetached()) 1133 if (isDetached())
1134 return WebString(); 1134 return WebString();
1135 1135
1136 Document* document = m_private->getDocument(); 1136 Document* document = m_private->getDocument();
1137 if (document) 1137 if (document)
1138 document->updateLayoutTree(); 1138 document->updateStyleAndLayoutTree();
1139 1139
1140 Node* node = m_private->getNode(); 1140 Node* node = m_private->getNode();
1141 if (!node) 1141 if (!node)
1142 return WebString(); 1142 return WebString();
1143 1143
1144 const ComputedStyle* computedStyle = node->ensureComputedStyle(); 1144 const ComputedStyle* computedStyle = node->ensureComputedStyle();
1145 if (!computedStyle) 1145 if (!computedStyle)
1146 return WebString(); 1146 return WebString();
1147 1147
1148 return WebString(CSSPrimitiveValue::create(computedStyle->display())->cssTex t()); 1148 return WebString(CSSPrimitiveValue::create(computedStyle->display())->cssTex t());
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1527 m_private = object; 1527 m_private = object;
1528 return *this; 1528 return *this;
1529 } 1529 }
1530 1530
1531 WebAXObject::operator AXObject*() const 1531 WebAXObject::operator AXObject*() const
1532 { 1532 {
1533 return m_private.get(); 1533 return m_private.get();
1534 } 1534 }
1535 1535
1536 } // namespace blink 1536 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698