| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 if (!m_layerTreeView) | 267 if (!m_layerTreeView) |
| 268 return; | 268 return; |
| 269 | 269 |
| 270 m_layerTreeView->setBackgroundColor(backgroundColor()); | 270 m_layerTreeView->setBackgroundColor(backgroundColor()); |
| 271 } | 271 } |
| 272 | 272 |
| 273 void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() { | 273 void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() { |
| 274 DCHECK(page()); | 274 DCHECK(page()); |
| 275 DCHECK(m_layerTreeView); | 275 DCHECK(m_layerTreeView); |
| 276 | 276 |
| 277 float deviceScaleFactor = page()->deviceScaleFactor(); | 277 float deviceScaleFactor = page()->deviceScaleFactorDeprecated(); |
| 278 m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor); | 278 m_layerTreeView->setDeviceScaleFactor(deviceScaleFactor); |
| 279 } | 279 } |
| 280 | 280 |
| 281 void WebFrameWidgetImpl::setIsTransparent(bool isTransparent) { | 281 void WebFrameWidgetImpl::setIsTransparent(bool isTransparent) { |
| 282 m_isTransparent = isTransparent; | 282 m_isTransparent = isTransparent; |
| 283 | 283 |
| 284 if (m_layerTreeView) | 284 if (m_layerTreeView) |
| 285 m_layerTreeView->setHasTransparentBackground(isTransparent); | 285 m_layerTreeView->setHasTransparentBackground(isTransparent); |
| 286 } | 286 } |
| 287 | 287 |
| (...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1142 return nullptr; | 1142 return nullptr; |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { | 1145 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { |
| 1146 if (!m_imeAcceptEvents) | 1146 if (!m_imeAcceptEvents) |
| 1147 return nullptr; | 1147 return nullptr; |
| 1148 return focusedLocalFrameInWidget(); | 1148 return focusedLocalFrameInWidget(); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 } // namespace blink | 1151 } // namespace blink |
| OLD | NEW |