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

Unified Diff: third_party/WebKit/Source/web/PopupMenuImpl.cpp

Issue 1774943003: blink: Rename platform/ methods to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-platform: rebase-yayyyyyyyy Created 4 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
Index: third_party/WebKit/Source/web/PopupMenuImpl.cpp
diff --git a/third_party/WebKit/Source/web/PopupMenuImpl.cpp b/third_party/WebKit/Source/web/PopupMenuImpl.cpp
index 93373ab6b0b2bd7fe093ff1f2e5ae86378e44758..30e34d7b40513a92e31834162be8dc33ea85f60b 100644
--- a/third_party/WebKit/Source/web/PopupMenuImpl.cpp
+++ b/third_party/WebKit/Source/web/PopupMenuImpl.cpp
@@ -205,7 +205,7 @@ public:
// Do not use baseStyle() for background-color, use backgroundColor()
// instead.
const ComputedStyle& baseStyle() { return m_isInGroup ? *m_groupStyle : m_baseStyle; }
- const FontDescription& baseFont() { return m_isInGroup ? m_groupStyle->fontDescription() : m_baseStyle.fontDescription(); }
+ const FontDescription& baseFont() { return m_isInGroup ? m_groupStyle->getFontDescription() : m_baseStyle.getFontDescription(); }
void startGroupChildren(const ComputedStyle& groupStyle)
{
ASSERT(!m_isInGroup);
@@ -325,7 +325,7 @@ void PopupMenuImpl::addElementStyle(ItemIterationContext& context, HTMLElement&
if (context.backgroundColor() != backgroundColor && backgroundColor != Color::transparent)
addProperty("backgroundColor", backgroundColor.serialized(), data);
const FontDescription& baseFont = context.baseFont();
- const FontDescription& fontDescription = style->font().fontDescription();
+ const FontDescription& fontDescription = style->font().getFontDescription();
if (baseFont.computedPixelSize() != fontDescription.computedPixelSize()) {
// We don't use FontDescription::specifiedSize() because this element
// might have its own zoom level.
« no previous file with comments | « third_party/WebKit/Source/web/PageOverlayTest.cpp ('k') | third_party/WebKit/Source/web/ResizeViewportAnchor.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698