| 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 3006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3017 | 3017 |
| 3018 void WebViewImpl::setZoomFactorForDeviceScaleFactor( | 3018 void WebViewImpl::setZoomFactorForDeviceScaleFactor( |
| 3019 float zoomFactorForDeviceScaleFactor) { | 3019 float zoomFactorForDeviceScaleFactor) { |
| 3020 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; | 3020 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; |
| 3021 if (!m_layerTreeView) | 3021 if (!m_layerTreeView) |
| 3022 return; | 3022 return; |
| 3023 setZoomLevel(m_zoomLevel); | 3023 setZoomLevel(m_zoomLevel); |
| 3024 } | 3024 } |
| 3025 | 3025 |
| 3026 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { | 3026 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { |
| 3027 Vector<char> deviceProfile; | 3027 ImageDecoder::setGlobalTargetColorProfile(colorProfile); |
| 3028 deviceProfile.append(colorProfile.data(), colorProfile.size()); | |
| 3029 ImageDecoder::setTargetColorProfile(deviceProfile); | |
| 3030 } | 3028 } |
| 3031 | 3029 |
| 3032 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, | 3030 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, |
| 3033 const WebSize& maxSize) { | 3031 const WebSize& maxSize) { |
| 3034 m_shouldAutoResize = true; | 3032 m_shouldAutoResize = true; |
| 3035 m_minAutoSize = minSize; | 3033 m_minAutoSize = minSize; |
| 3036 m_maxAutoSize = maxSize; | 3034 m_maxAutoSize = maxSize; |
| 3037 configureAutoResizeMode(); | 3035 configureAutoResizeMode(); |
| 3038 } | 3036 } |
| 3039 | 3037 |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4198 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4196 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
| 4199 return nullptr; | 4197 return nullptr; |
| 4200 return focusedFrame; | 4198 return focusedFrame; |
| 4201 } | 4199 } |
| 4202 | 4200 |
| 4203 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4201 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
| 4204 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4202 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
| 4205 } | 4203 } |
| 4206 | 4204 |
| 4207 } // namespace blink | 4205 } // namespace blink |
| OLD | NEW |