Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(327)

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2605743002: Use consistent types for ICC profiles (Closed)
Patch Set: No export for static lib Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 3014 matching lines...) Expand 10 before | Expand all | Expand 10 after
3025 } 3025 }
3026 3026
3027 void WebViewImpl::setZoomFactorForDeviceScaleFactor( 3027 void WebViewImpl::setZoomFactorForDeviceScaleFactor(
3028 float zoomFactorForDeviceScaleFactor) { 3028 float zoomFactorForDeviceScaleFactor) {
3029 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor; 3029 m_zoomFactorForDeviceScaleFactor = zoomFactorForDeviceScaleFactor;
3030 if (!m_layerTreeView) 3030 if (!m_layerTreeView)
3031 return; 3031 return;
3032 setZoomLevel(m_zoomLevel); 3032 setZoomLevel(m_zoomLevel);
3033 } 3033 }
3034 3034
3035 void WebViewImpl::setDeviceColorProfile(const WebVector<char>& colorProfile) { 3035 void WebViewImpl::setDeviceColorSpace(const gfx::ColorSpace& colorSpace) {
3036 ColorBehavior::setGlobalTargetColorProfile(colorProfile); 3036 ColorBehavior::setGlobalTargetColorSpace(colorSpace.ToSkColorSpace());
3037 } 3037 }
3038 3038
3039 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, 3039 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize,
3040 const WebSize& maxSize) { 3040 const WebSize& maxSize) {
3041 m_shouldAutoResize = true; 3041 m_shouldAutoResize = true;
3042 m_minAutoSize = minSize; 3042 m_minAutoSize = minSize;
3043 m_maxAutoSize = maxSize; 3043 m_maxAutoSize = maxSize;
3044 configureAutoResizeMode(); 3044 configureAutoResizeMode();
3045 } 3045 }
3046 3046
(...skipping 1155 matching lines...) Expand 10 before | Expand all | Expand 10 after
4202 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4202 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4203 return nullptr; 4203 return nullptr;
4204 return focusedFrame; 4204 return focusedFrame;
4205 } 4205 }
4206 4206
4207 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4207 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4208 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4208 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4209 } 4209 }
4210 4210
4211 } // namespace blink 4211 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698