| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 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 3004 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3015 } | 3015 } |
| 3016 | 3016 |
| 3017 void WebViewImpl::setZoomFactorForDeviceScaleFactor( | 3017 void WebViewImpl::setZoomFactorForDeviceScaleFactor( |
| 3018 float zoomFactorForDeviceScaleFactor) { | 3018 float zoomFactorForDeviceScaleFactor) { |
| 3019 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; | 3019 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; |
| 3020 if (!m_layerTreeView) | 3020 if (!m_layerTreeView) |
| 3021 return; | 3021 return; |
| 3022 setZoomLevel(m_zoomLevel); | 3022 setZoomLevel(m_zoomLevel); |
| 3023 } | 3023 } |
| 3024 | 3024 |
| 3025 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { | 3025 void WebViewImpl::setDeviceColorProfile(const gfx::ICCProfile& colorProfile) { |
| 3026 ColorBehavior::setGlobalTargetColorProfile(colorProfile); | 3026 ColorBehavior::setGlobalTargetColorProfile(colorProfile); |
| 3027 } | 3027 } |
| 3028 | 3028 |
| 3029 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, | 3029 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, |
| 3030 const WebSize& maxSize) { | 3030 const WebSize& maxSize) { |
| 3031 m_shouldAutoResize = true; | 3031 m_shouldAutoResize = true; |
| 3032 m_minAutoSize = minSize; | 3032 m_minAutoSize = minSize; |
| 3033 m_maxAutoSize = maxSize; | 3033 m_maxAutoSize = maxSize; |
| 3034 configureAutoResizeMode(); | 3034 configureAutoResizeMode(); |
| 3035 } | 3035 } |
| (...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4191 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4191 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
| 4192 return nullptr; | 4192 return nullptr; |
| 4193 return focusedFrame; | 4193 return focusedFrame; |
| 4194 } | 4194 } |
| 4195 | 4195 |
| 4196 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4196 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
| 4197 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4197 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
| 4198 } | 4198 } |
| 4199 | 4199 |
| 4200 } // namespace blink | 4200 } // namespace blink |
| OLD | NEW |