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

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 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1120 return WebDocument(document); 1120 return WebDocument(document);
1121 } 1121 }
1122 1122
1123 bool WebAXObject::hasComputedStyle() const 1123 bool WebAXObject::hasComputedStyle() const
1124 { 1124 {
1125 if (isDetached()) 1125 if (isDetached())
1126 return false; 1126 return false;
1127 1127
1128 Document* document = m_private->getDocument(); 1128 Document* document = m_private->getDocument();
1129 if (document) 1129 if (document)
1130 document->updateLayoutTree(); 1130 document->updateStyleAndLayoutTree();
1131 1131
1132 Node* node = m_private->getNode(); 1132 Node* node = m_private->getNode();
1133 if (!node) 1133 if (!node)
1134 return false; 1134 return false;
1135 1135
1136 return node->ensureComputedStyle(); 1136 return node->ensureComputedStyle();
1137 } 1137 }
1138 1138
1139 WebString WebAXObject::computedStyleDisplay() const 1139 WebString WebAXObject::computedStyleDisplay() const
1140 { 1140 {
1141 if (isDetached()) 1141 if (isDetached())
1142 return WebString(); 1142 return WebString();
1143 1143
1144 Document* document = m_private->getDocument(); 1144 Document* document = m_private->getDocument();
1145 if (document) 1145 if (document)
1146 document->updateLayoutTree(); 1146 document->updateStyleAndLayoutTree();
1147 1147
1148 Node* node = m_private->getNode(); 1148 Node* node = m_private->getNode();
1149 if (!node) 1149 if (!node)
1150 return WebString(); 1150 return WebString();
1151 1151
1152 const ComputedStyle* computedStyle = node->ensureComputedStyle(); 1152 const ComputedStyle* computedStyle = node->ensureComputedStyle();
1153 if (!computedStyle) 1153 if (!computedStyle)
1154 return WebString(); 1154 return WebString();
1155 1155
1156 return WebString(CSSPrimitiveValue::create(computedStyle->display())->cssTex t()); 1156 return WebString(CSSPrimitiveValue::create(computedStyle->display())->cssTex t());
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
1535 m_private = object; 1535 m_private = object;
1536 return *this; 1536 return *this;
1537 } 1537 }
1538 1538
1539 WebAXObject::operator AXObject*() const 1539 WebAXObject::operator AXObject*() const
1540 { 1540 {
1541 return m_private.get(); 1541 return m_private.get();
1542 } 1542 }
1543 1543
1544 } // namespace blink 1544 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/PopupMenuImpl.cpp ('k') | third_party/WebKit/Source/web/WebLocalFrameImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698