Chromium Code Reviews| 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 3027 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3038 float zoomFactorForDeviceScaleFactor) { | 3038 float zoomFactorForDeviceScaleFactor) { |
| 3039 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; | 3039 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; |
| 3040 if (!m_layerTreeView) | 3040 if (!m_layerTreeView) |
| 3041 return; | 3041 return; |
| 3042 setZoomLevel(m_zoomLevel); | 3042 setZoomLevel(m_zoomLevel); |
| 3043 } | 3043 } |
| 3044 | 3044 |
| 3045 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { | 3045 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { |
| 3046 Vector<char> deviceProfile; | 3046 Vector<char> deviceProfile; |
| 3047 deviceProfile.append(colorProfile.data(), colorProfile.size()); | 3047 deviceProfile.append(colorProfile.data(), colorProfile.size()); |
| 3048 ImageDecoder::setTargetColorProfile(deviceProfile); | 3048 ImageDecoder::setGlobalTargetColorProfile(deviceProfile); |
|
esprehn
2016/11/21 20:19:30
This is forcing a copy to convert from WTF::Vector
ccameron
2016/11/21 22:28:14
Updated to pass colorProfile directly (I wonder wh
| |
| 3049 } | 3049 } |
| 3050 | 3050 |
| 3051 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, | 3051 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, |
| 3052 const WebSize& maxSize) { | 3052 const WebSize& maxSize) { |
| 3053 m_shouldAutoResize = true; | 3053 m_shouldAutoResize = true; |
| 3054 m_minAutoSize = minSize; | 3054 m_minAutoSize = minSize; |
| 3055 m_maxAutoSize = maxSize; | 3055 m_maxAutoSize = maxSize; |
| 3056 configureAutoResizeMode(); | 3056 configureAutoResizeMode(); |
| 3057 } | 3057 } |
| 3058 | 3058 |
| (...skipping 1158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4217 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) | 4217 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) |
| 4218 return nullptr; | 4218 return nullptr; |
| 4219 return focusedFrame; | 4219 return focusedFrame; |
| 4220 } | 4220 } |
| 4221 | 4221 |
| 4222 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { | 4222 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { |
| 4223 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; | 4223 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; |
| 4224 } | 4224 } |
| 4225 | 4225 |
| 4226 } // namespace blink | 4226 } // namespace blink |
| OLD | NEW |