Chromium Code Reviews| 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 254 | 254 |
| 255 void WebFrameWidgetImpl::paint(WebCanvas* canvas, const WebRect& rect) { | 255 void WebFrameWidgetImpl::paint(WebCanvas* canvas, const WebRect& rect) { |
| 256 // Out-of-process iframes require compositing. | 256 // Out-of-process iframes require compositing. |
| 257 NOTREACHED(); | 257 NOTREACHED(); |
| 258 } | 258 } |
| 259 | 259 |
| 260 void WebFrameWidgetImpl::updateLayerTreeViewport() { | 260 void WebFrameWidgetImpl::updateLayerTreeViewport() { |
| 261 if (!page() || !m_layerTreeView) | 261 if (!page() || !m_layerTreeView) |
| 262 return; | 262 return; |
| 263 | 263 |
| 264 // FIXME: We need access to page scale information from the WebView. | 264 m_layerTreeView->setPageScaleFactorAndLimits( |
| 265 m_layerTreeView->setPageScaleFactorAndLimits(1, 1, 1); | 265 1, view()->minimumPageScaleFactor(), view()->maximumPageScaleFactor()); |
|
bokan
2016/11/03 14:55:50
Is it ok that we'll be clobbering the page scale f
| |
| 266 } | 266 } |
| 267 | 267 |
| 268 void WebFrameWidgetImpl::updateLayerTreeBackgroundColor() { | 268 void WebFrameWidgetImpl::updateLayerTreeBackgroundColor() { |
| 269 if (!m_layerTreeView) | 269 if (!m_layerTreeView) |
| 270 return; | 270 return; |
| 271 | 271 |
| 272 m_layerTreeView->setBackgroundColor(backgroundColor()); | 272 m_layerTreeView->setBackgroundColor(backgroundColor()); |
| 273 } | 273 } |
| 274 | 274 |
| 275 void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() { | 275 void WebFrameWidgetImpl::updateLayerTreeDeviceScaleFactor() { |
| (...skipping 935 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1211 return nullptr; | 1211 return nullptr; |
| 1212 } | 1212 } |
| 1213 | 1213 |
| 1214 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { | 1214 LocalFrame* WebFrameWidgetImpl::focusedLocalFrameAvailableForIme() const { |
| 1215 if (!m_imeAcceptEvents) | 1215 if (!m_imeAcceptEvents) |
| 1216 return nullptr; | 1216 return nullptr; |
| 1217 return focusedLocalFrameInWidget(); | 1217 return focusedLocalFrameInWidget(); |
| 1218 } | 1218 } |
| 1219 | 1219 |
| 1220 } // namespace blink | 1220 } // namespace blink |
| OLD | NEW |