| 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 1006 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1017 } | 1017 } |
| 1018 | 1018 |
| 1019 void WebViewImpl::setShowScrollBottleneckRects(bool show) | 1019 void WebViewImpl::setShowScrollBottleneckRects(bool show) |
| 1020 { | 1020 { |
| 1021 if (m_layerTreeView) | 1021 if (m_layerTreeView) |
| 1022 m_layerTreeView->setShowScrollBottleneckRects(show); | 1022 m_layerTreeView->setShowScrollBottleneckRects(show); |
| 1023 } | 1023 } |
| 1024 | 1024 |
| 1025 void WebViewImpl::acceptLanguagesChanged() | 1025 void WebViewImpl::acceptLanguagesChanged() |
| 1026 { | 1026 { |
| 1027 if (m_client) |
| 1028 FontCache::acceptLanguagesChanged(m_client->acceptLanguages()); |
| 1029 |
| 1027 if (!page()) | 1030 if (!page()) |
| 1028 return; | 1031 return; |
| 1029 | 1032 |
| 1030 page()->acceptLanguagesChanged(); | 1033 page()->acceptLanguagesChanged(); |
| 1031 } | 1034 } |
| 1032 | 1035 |
| 1033 WebInputEventResult WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event) | 1036 WebInputEventResult WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event) |
| 1034 { | 1037 { |
| 1035 ASSERT((event.type == WebInputEvent::RawKeyDown) | 1038 ASSERT((event.type == WebInputEvent::RawKeyDown) |
| 1036 || (event.type == WebInputEvent::KeyDown) | 1039 || (event.type == WebInputEvent::KeyDown) |
| (...skipping 3527 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4564 { | 4567 { |
| 4565 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than | 4568 // TODO(oshima): Investigate if this should return the ScreenInfo's scale fa
ctor rather than |
| 4566 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. | 4569 // page's scale factor, which can be 1 in use-zoom-for-dsf mode. |
| 4567 if (!page()) | 4570 if (!page()) |
| 4568 return 1; | 4571 return 1; |
| 4569 | 4572 |
| 4570 return page()->deviceScaleFactor(); | 4573 return page()->deviceScaleFactor(); |
| 4571 } | 4574 } |
| 4572 | 4575 |
| 4573 } // namespace blink | 4576 } // namespace blink |
| OLD | NEW |