Page popups should respect zoom factor of the anchor element.

third_party/WebKit/Source/web/PopupMenuImpl.cpp

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
@@ skipping 170 matching lines @@
 #endif
     }
 
     void serializeBaseStyle()
     {
         ASSERT(!m_isInGroup);
         PagePopupClient::addString("baseStyle: {", m_buffer);
         addProperty("backgroundColor", m_backgroundColor.serialized(), m_buffer);
         addProperty("color", baseStyle().visitedDependentColor(CSSPropertyColor).serialized(), m_buffer);
         addProperty("textTransform", String(textTransformToString(baseStyle().textTransform())), m_buffer);
-        addProperty("fontSize", baseFont().computedPixelSize(), m_buffer);
+        addProperty("fontSize", baseFont().specifiedSize(), m_buffer);
         addProperty("fontStyle", String(fontStyleToString(baseFont().style())), m_buffer);
         addProperty("fontVariant", String(fontVariantToString(baseFont().variant())), m_buffer);
 
         PagePopupClient::addString("fontFamily: [", m_buffer);
         for (const FontFamily* f = &baseFont().family(); f; f = f->next()) {
             addJavaScriptString(f->family().string(), m_buffer);
             if (f->next())
                 PagePopupClient::addString(",", m_buffer);
         }
         PagePopupClient::addString("]", m_buffer);
@@ skipping 80 matching lines @@
         if (isHTMLOptionElement(child))
             addOption(context, toHTMLOptionElement(child));
         else if (isHTMLOptGroupElement(child))
             addOptGroup(context, toHTMLOptGroupElement(child));
         else if (isHTMLHRElement(child))
             addSeparator(context, toHTMLHRElement(child));
     }
     context.finishGroupIfNecessary();
     PagePopupClient::addString("],\n", data);
 
+    float zoom = zoomFactor();
     addProperty("anchorRectInScreen", anchorRectInScreen, data);
+    addProperty("zoomFactor", zoom, data);
     bool isRTL = !ownerStyle->isLeftToRightDirection();
     addProperty("isRTL", isRTL, data);
-    addProperty("paddingStart", isRTL ? ownerElement.clientPaddingRight().toDouble() : ownerElement.clientPaddingLeft().toDouble(), data);
+    addProperty("paddingStart", isRTL ? ownerElement.clientPaddingRight().toDouble() / zoom : ownerElement.clientPaddingLeft().toDouble() / zoom, data);
     PagePopupClient::addString("};\n", data);
     data->append(Platform::current()->loadResource("pickerCommon.js"));
     data->append(Platform::current()->loadResource("listPicker.js"));
     PagePopupClient::addString("</script></body>\n", data);
 }
 
 void PopupMenuImpl::addElementStyle(ItemIterationContext& context, HTMLElement& element)
 {
     const ComputedStyle* style = m_ownerElement->itemComputedStyle(element);
     ASSERT(style);
@@ skipping 11 matching lines @@
     if (isOverride(style->unicodeBidi()))
         addProperty("unicodeBidi", String("bidi-override"), data);
     Color foregroundColor = style->visitedDependentColor(CSSPropertyColor);
     if (baseStyle.visitedDependentColor(CSSPropertyColor) != foregroundColor)
         addProperty("color", foregroundColor.serialized(), data);
     Color backgroundColor = style->visitedDependentColor(CSSPropertyBackgroundColor);
     if (context.backgroundColor() != backgroundColor && backgroundColor != Color::transparent)
         addProperty("backgroundColor", backgroundColor.serialized(), data);
     const FontDescription& baseFont = context.baseFont();
     const FontDescription& fontDescription = style->font().fontDescription();
-    if (baseFont.computedPixelSize() != fontDescription.computedPixelSize())
-        addProperty("fontSize", fontDescription.computedPixelSize(), data);
+    if (baseFont.computedPixelSize() != fontDescription.computedPixelSize()) {
+        // We don't use FontDescription::specifiedSize() because this element
+        // might have its own zoom level.
+        addProperty("fontSize", fontDescription.computedSize() / zoomFactor(), data);
+    }
     // Our UA stylesheet has font-weight:normal for OPTION.
     if (FontWeightNormal != fontDescription.weight())
         addProperty("fontWeight", String(fontWeightToString(fontDescription.weight())), data);
     if (baseFont.family() != fontDescription.family()) {
         PagePopupClient::addString("fontFamily: [\n", data);
         for (const FontFamily* f = &fontDescription.family(); f; f = f->next()) {
             addJavaScriptString(f->family().string(), data);
             if (f->next())
                 PagePopupClient::addString(",\n", data);
         }
@@ skipping 178 matching lines @@
 
 void PopupMenuImpl::disconnectClient()
 {
     m_ownerElement = nullptr;
     // Cannot be done during finalization, so instead done when the
     // layout object is destroyed and disconnected.
     dispose();
 }
 
 } // namespace blink