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

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

Issue 352873002: [wip] image color correction (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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 2822 matching lines...) Expand 10 before | Expand all | Expand 10 after
2833 { 2833 {
2834 if (!page()) 2834 if (!page())
2835 return; 2835 return;
2836 2836
2837 page()->setDeviceScaleFactor(scaleFactor); 2837 page()->setDeviceScaleFactor(scaleFactor);
2838 2838
2839 if (m_layerTreeView) 2839 if (m_layerTreeView)
2840 updateLayerTreeDeviceScaleFactor(); 2840 updateLayerTreeDeviceScaleFactor();
2841 } 2841 }
2842 2842
2843 void WebViewImpl::deviceColorProfileChanged(const char* profile, size_t size)
2844 {
2845 if (!page())
2846 return;
2847
2848 page()->deviceColorProfileChanged(profile, size);
2849 }
2850
2843 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& ma xSize) 2851 void WebViewImpl::enableAutoResizeMode(const WebSize& minSize, const WebSize& ma xSize)
2844 { 2852 {
2845 m_shouldAutoResize = true; 2853 m_shouldAutoResize = true;
2846 m_minAutoSize = minSize; 2854 m_minAutoSize = minSize;
2847 m_maxAutoSize = maxSize; 2855 m_maxAutoSize = maxSize;
2848 configureAutoResizeMode(); 2856 configureAutoResizeMode();
2849 } 2857 }
2850 2858
2851 void WebViewImpl::disableAutoResizeMode() 2859 void WebViewImpl::disableAutoResizeMode()
2852 { 2860 {
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
4138 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4146 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4139 4147
4140 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4148 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4141 return false; 4149 return false;
4142 4150
4143 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4151 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4144 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4152 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4145 } 4153 }
4146 4154
4147 } // namespace blink 4155 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698