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

Unified Diff: Source/core/html/HTMLOptGroupElement.cpp

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.h ('k') | Source/core/html/HTMLOptionElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLOptGroupElement.cpp
diff --git a/Source/core/html/HTMLOptGroupElement.cpp b/Source/core/html/HTMLOptGroupElement.cpp
index 7583e22b35938df4a82412f79a67665704ccbed1..0d017ec6a0f7013160c866892c0b8a49e38b9715 100644
--- a/Source/core/html/HTMLOptGroupElement.cpp
+++ b/Source/core/html/HTMLOptGroupElement.cpp
@@ -26,7 +26,7 @@
#include "core/html/HTMLOptGroupElement.h"
#include "core/HTMLNames.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/Text.h"
#include "core/editing/htmlediting.h"
#include "core/html/HTMLContentElement.h"
@@ -106,7 +106,7 @@ bool HTMLOptGroupElement::supportsFocus() const
return HTMLElement::supportsFocus();
}
-void HTMLOptGroupElement::updateNonLayoutStyle()
+void HTMLOptGroupElement::updateNonComputedStyle()
{
m_style = originalStyleForLayoutObject();
if (layoutObject()) {
@@ -115,14 +115,14 @@ void HTMLOptGroupElement::updateNonLayoutStyle()
}
}
-LayoutStyle* HTMLOptGroupElement::nonRendererStyle() const
+ComputedStyle* HTMLOptGroupElement::nonLayoutObjectComputedStyle() const
{
return m_style.get();
}
-PassRefPtr<LayoutStyle> HTMLOptGroupElement::customStyleForLayoutObject()
+PassRefPtr<ComputedStyle> HTMLOptGroupElement::customStyleForLayoutObject()
{
- updateNonLayoutStyle();
+ updateNonComputedStyle();
return m_style;
}
« no previous file with comments | « Source/core/html/HTMLOptGroupElement.h ('k') | Source/core/html/HTMLOptionElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698