SELECT popup: Don't use non-100% zoom level in popup.

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 "web/PopupMenuImpl.h"
 
 #include "core/HTMLNames.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/ExecutionContextTask.h"
@@ skipping 159 matching lines @@
     DCHECK(!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().specifiedSize(), m_buffer);
+    addProperty("fontSize", baseFont().computedPixelSize(), m_buffer);
     addProperty("fontStyle", String(fontStyleToString(baseFont().style())),
                 m_buffer);
     addProperty("fontVariant",
                 baseFont().variantCaps() == FontDescription::SmallCaps
                     ? String("small-caps")
                     : String(),
                 m_buffer);
 
     PagePopupClient::addString("fontFamily: [", m_buffer);
     for (const FontFamily* f = &baseFont().family(); f; f = f->next()) {
@@ skipping 94 matching lines @@
       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);
 
   addProperty("anchorRectInScreen", anchorRectInScreen, data);
-  float zoom = zoomFactor();
   float scaleFactor = m_chromeClient->windowToViewportScalar(1.f);
-  addProperty("zoomFactor", zoom / scaleFactor, data);
+  addProperty("zoomFactor", 1, data);
+  addProperty("scaleFactor", scaleFactor, data);
   bool isRTL = !ownerStyle->isLeftToRightDirection();
   addProperty("isRTL", isRTL, data);
   addProperty("paddingStart",
-              isRTL ? ownerElement.clientPaddingRight().toDouble() / zoom
-                    : ownerElement.clientPaddingLeft().toDouble() / zoom,
+              isRTL ? ownerElement.clientPaddingRight().toDouble()
+                    : ownerElement.clientPaddingLeft().toDouble(),
               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);
@@ skipping 20 matching lines @@
   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().getFontDescription();
   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);
+    addProperty("fontSize", fontDescription.computedPixelSize(), 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().getString(), data);
       if (f->next())
@@ skipping 199 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