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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 #include "weborigin/SchemeRegistry.h" | 159 #include "weborigin/SchemeRegistry.h" |
160 #include "weborigin/SecurityOrigin.h" | 160 #include "weborigin/SecurityOrigin.h" |
161 #include "weborigin/SecurityPolicy.h" | 161 #include "weborigin/SecurityPolicy.h" |
162 #include "wtf/CurrentTime.h" | 162 #include "wtf/CurrentTime.h" |
163 #include "wtf/MainThread.h" | 163 #include "wtf/MainThread.h" |
164 #include "wtf/RefPtr.h" | 164 #include "wtf/RefPtr.h" |
165 #include "wtf/TemporaryChange.h" | 165 #include "wtf/TemporaryChange.h" |
166 #include "wtf/Uint8ClampedArray.h" | 166 #include "wtf/Uint8ClampedArray.h" |
167 | 167 |
168 #if USE(DEFAULT_RENDER_THEME) | 168 #if USE(DEFAULT_RENDER_THEME) |
169 #include "core/platform/chromium/PlatformThemeChromiumDefault.h" | |
170 #include "core/rendering/RenderThemeChromiumDefault.h" | 169 #include "core/rendering/RenderThemeChromiumDefault.h" |
171 #endif | 170 #endif |
172 | 171 |
173 #if OS(WIN) | 172 #if OS(WIN) |
174 #if !USE(DEFAULT_RENDER_THEME) | 173 #if !USE(DEFAULT_RENDER_THEME) |
175 #include "core/rendering/RenderThemeChromiumWin.h" | 174 #include "core/rendering/RenderThemeChromiumWin.h" |
176 #endif | 175 #endif |
177 #else | 176 #else |
178 #include "core/rendering/RenderTheme.h" | 177 #include "core/rendering/RenderTheme.h" |
179 #endif | 178 #endif |
(...skipping 3394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3574 void WebViewImpl::setDomainRelaxationForbidden(bool forbidden, const WebString&
scheme) | 3573 void WebViewImpl::setDomainRelaxationForbidden(bool forbidden, const WebString&
scheme) |
3575 { | 3574 { |
3576 SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String(s
cheme)); | 3575 SchemeRegistry::setDomainRelaxationForbiddenForURLScheme(forbidden, String(s
cheme)); |
3577 } | 3576 } |
3578 | 3577 |
3579 void WebViewImpl::setWindowFeatures(const WebWindowFeatures& features) | 3578 void WebViewImpl::setWindowFeatures(const WebWindowFeatures& features) |
3580 { | 3579 { |
3581 m_page->chrome().setWindowFeatures(features); | 3580 m_page->chrome().setWindowFeatures(features); |
3582 } | 3581 } |
3583 | 3582 |
| 3583 // FIXME: remove this api. See: https://codereview.chromium.org/17279002/. |
3584 void WebViewImpl::setScrollbarColors(unsigned inactiveColor, | 3584 void WebViewImpl::setScrollbarColors(unsigned inactiveColor, |
3585 unsigned activeColor, | 3585 unsigned activeColor, |
3586 unsigned trackColor) { | 3586 unsigned trackColor) { |
3587 #if USE(DEFAULT_RENDER_THEME) | |
3588 PlatformThemeChromiumDefault::setScrollbarColors(inactiveColor, activeColor,
trackColor); | |
3589 #endif | |
3590 } | 3587 } |
3591 | 3588 |
3592 void WebViewImpl::setSelectionColors(unsigned activeBackgroundColor, | 3589 void WebViewImpl::setSelectionColors(unsigned activeBackgroundColor, |
3593 unsigned activeForegroundColor, | 3590 unsigned activeForegroundColor, |
3594 unsigned inactiveBackgroundColor, | 3591 unsigned inactiveBackgroundColor, |
3595 unsigned inactiveForegroundColor) { | 3592 unsigned inactiveForegroundColor) { |
3596 #if USE(DEFAULT_RENDER_THEME) | 3593 #if USE(DEFAULT_RENDER_THEME) |
3597 RenderThemeChromiumDefault::setSelectionColors(activeBackgroundColor, active
ForegroundColor, inactiveBackgroundColor, inactiveForegroundColor); | 3594 RenderThemeChromiumDefault::setSelectionColors(activeBackgroundColor, active
ForegroundColor, inactiveBackgroundColor, inactiveForegroundColor); |
3598 RenderTheme::theme().platformColorsDidChange(); | 3595 RenderTheme::theme().platformColorsDidChange(); |
3599 #endif | 3596 #endif |
(...skipping 537 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4137 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); | 4134 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi
nedConstraints(); |
4138 | 4135 |
4139 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) | 4136 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) |
4140 return false; | 4137 return false; |
4141 | 4138 |
4142 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width | 4139 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width |
4143 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); | 4140 || (constraints.minimumScale == constraints.maximumScale && constraints.
minimumScale != -1); |
4144 } | 4141 } |
4145 | 4142 |
4146 } // namespace WebKit | 4143 } // namespace WebKit |
OLD | NEW |