OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
221 } | 221 } |
222 } | 222 } |
223 | 223 |
224 void WebPopupMenuImpl::paint(WebCanvas* canvas, const WebRect& rect) | 224 void WebPopupMenuImpl::paint(WebCanvas* canvas, const WebRect& rect) |
225 { | 225 { |
226 if (!m_widget) | 226 if (!m_widget) |
227 return; | 227 return; |
228 | 228 |
229 if (!rect.isEmpty()) { | 229 if (!rect.isEmpty()) { |
230 GraphicsContext context(canvas); | 230 GraphicsContext context(canvas); |
231 context.applyDeviceScaleFactor(m_client->deviceScaleFactor()); | 231 float scaleFactor = m_client->deviceScaleFactor(); |
232 context.scale(scaleFactor, scaleFactor); | |
Stephen Chennney
2014/11/14 15:26:22
This really needs to set it also, to be sure we al
| |
232 m_widget->paint(&context, rect); | 233 m_widget->paint(&context, rect); |
233 } | 234 } |
234 } | 235 } |
235 | 236 |
236 void WebPopupMenuImpl::themeChanged() | 237 void WebPopupMenuImpl::themeChanged() |
237 { | 238 { |
238 notImplemented(); | 239 notImplemented(); |
239 } | 240 } |
240 | 241 |
241 bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent) | 242 bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent) |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
400 ASSERT(widget == m_widget); | 401 ASSERT(widget == m_widget); |
401 if (m_widget) { | 402 if (m_widget) { |
402 m_widget->setClient(0); | 403 m_widget->setClient(0); |
403 m_widget = 0; | 404 m_widget = 0; |
404 } | 405 } |
405 if (m_client) | 406 if (m_client) |
406 m_client->closeWidgetSoon(); | 407 m_client->closeWidgetSoon(); |
407 } | 408 } |
408 | 409 |
409 } // namespace blink | 410 } // namespace blink |
OLD | NEW |