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

Unified Diff: Source/web/PopupMenuImpl.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/web/FindInPageCoordinates.cpp ('k') | Source/web/PopupMenuTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/PopupMenuImpl.cpp
diff --git a/Source/web/PopupMenuImpl.cpp b/Source/web/PopupMenuImpl.cpp
index e334559ceaf970c295193d196df39a896b1864d4..78e1cbfaf0ac19cca6be6e286a20a31470e8eddb 100644
--- a/Source/web/PopupMenuImpl.cpp
+++ b/Source/web/PopupMenuImpl.cpp
@@ -8,7 +8,7 @@
#include "core/HTMLNames.h"
#include "core/css/CSSFontSelector.h"
#include "core/dom/ElementTraversal.h"
-#include "core/dom/NodeLayoutStyle.h"
+#include "core/dom/NodeComputedStyle.h"
#include "core/dom/StyleEngine.h"
#include "core/frame/FrameView.h"
#include "core/html/HTMLHRElement.h"
@@ -103,7 +103,7 @@ void PopupMenuImpl::writeDocument(SharedBuffer* data)
}
PagePopupClient::addString("],\n", data);
addProperty("anchorRectInScreen", anchorRectInScreen, data);
- const LayoutStyle* ownerStyle = ownerElement().layoutStyle();
+ const ComputedStyle* ownerStyle = ownerElement().computedStyle();
Color backgroundColor = ownerStyle->visitedDependentColor(CSSPropertyBackgroundColor);
#if OS(LINUX)
// On other platforms, the <option> background color is the same as the
@@ -154,7 +154,7 @@ const char* fontWeightToString(FontWeight weight)
void PopupMenuImpl::addElementStyle(HTMLElement& element, SharedBuffer* data)
{
- const LayoutStyle* style = m_client->layoutStyleForItem(element);
+ const ComputedStyle* style = m_client->computedStyleForItem(element);
ASSERT(style);
PagePopupClient::addString("style: {\n", data);
addProperty("color", style->visitedDependentColor(CSSPropertyColor).serialized(), data);
« no previous file with comments | « Source/web/FindInPageCoordinates.cpp ('k') | Source/web/PopupMenuTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698