| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 , m_showFPSCounter(false) | 51 , m_showFPSCounter(false) |
| 52 , m_showPaintRects(false) | 52 , m_showPaintRects(false) |
| 53 , m_renderVSyncNotificationEnabled(false) | 53 , m_renderVSyncNotificationEnabled(false) |
| 54 , m_gestureTapHighlightEnabled(true) | 54 , m_gestureTapHighlightEnabled(true) |
| 55 , m_autoZoomFocusedNodeToLegibleScale(false) | 55 , m_autoZoomFocusedNodeToLegibleScale(false) |
| 56 , m_deferredImageDecodingEnabled(false) | 56 , m_deferredImageDecodingEnabled(false) |
| 57 , m_doubleTapToZoomEnabled(false) | 57 , m_doubleTapToZoomEnabled(false) |
| 58 , m_supportDeprecatedTargetDensityDPI(false) | 58 , m_supportDeprecatedTargetDensityDPI(false) |
| 59 , m_viewportMetaLayoutSizeQuirk(false) | 59 , m_viewportMetaLayoutSizeQuirk(false) |
| 60 , m_pinchOverlayScrollbarThickness(0) | 60 , m_pinchOverlayScrollbarThickness(0) |
| 61 , m_mainFrameResizesAreOrientationChanges(false) |
| 61 { | 62 { |
| 62 ASSERT(settings); | 63 ASSERT(settings); |
| 63 } | 64 } |
| 64 | 65 |
| 65 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s
cript) | 66 void WebSettingsImpl::setStandardFontFamily(const WebString& font, UScriptCode s
cript) |
| 66 { | 67 { |
| 67 m_settings->setStandardFontFamily(font, script); | 68 m_settings->setStandardFontFamily(font, script); |
| 68 } | 69 } |
| 69 | 70 |
| 70 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri
pt) | 71 void WebSettingsImpl::setFixedFontFamily(const WebString& font, UScriptCode scri
pt) |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 639 bool WebSettingsImpl::touchEditingEnabled() const | 640 bool WebSettingsImpl::touchEditingEnabled() const |
| 640 { | 641 { |
| 641 return m_settings->touchEditingEnabled(); | 642 return m_settings->touchEditingEnabled(); |
| 642 } | 643 } |
| 643 | 644 |
| 644 bool WebSettingsImpl::viewportEnabled() const | 645 bool WebSettingsImpl::viewportEnabled() const |
| 645 { | 646 { |
| 646 return m_settings->viewportEnabled(); | 647 return m_settings->viewportEnabled(); |
| 647 } | 648 } |
| 648 | 649 |
| 650 bool WebSettingsImpl::viewportMetaEnabled() const |
| 651 { |
| 652 return m_settings->viewportMetaEnabled(); |
| 653 } |
| 654 |
| 655 bool WebSettingsImpl::mainFrameResizesAreOrientationChanges() const |
| 656 { |
| 657 return m_mainFrameResizesAreOrientationChanges; |
| 658 } |
| 659 |
| 649 void WebSettingsImpl::setShouldDisplaySubtitles(bool enabled) | 660 void WebSettingsImpl::setShouldDisplaySubtitles(bool enabled) |
| 650 { | 661 { |
| 651 m_settings->setShouldDisplaySubtitles(enabled); | 662 m_settings->setShouldDisplaySubtitles(enabled); |
| 652 } | 663 } |
| 653 | 664 |
| 654 void WebSettingsImpl::setShouldDisplayCaptions(bool enabled) | 665 void WebSettingsImpl::setShouldDisplayCaptions(bool enabled) |
| 655 { | 666 { |
| 656 m_settings->setShouldDisplayCaptions(enabled); | 667 m_settings->setShouldDisplayCaptions(enabled); |
| 657 } | 668 } |
| 658 | 669 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 676 m_settings->setMediaFullscreenRequiresUserGesture(required); | 687 m_settings->setMediaFullscreenRequiresUserGesture(required); |
| 677 } | 688 } |
| 678 | 689 |
| 679 void WebSettingsImpl::setFixedPositionCreatesStackingContext(bool creates) | 690 void WebSettingsImpl::setFixedPositionCreatesStackingContext(bool creates) |
| 680 { | 691 { |
| 681 m_settings->setFixedPositionCreatesStackingContext(creates); | 692 m_settings->setFixedPositionCreatesStackingContext(creates); |
| 682 } | 693 } |
| 683 | 694 |
| 684 void WebSettingsImpl::setViewportEnabled(bool enabled) | 695 void WebSettingsImpl::setViewportEnabled(bool enabled) |
| 685 { | 696 { |
| 697 // FIXME: Remove once Chromium side changes land |
| 698 setMainFrameResizesAreOrientationChanges(enabled); |
| 699 |
| 686 m_settings->setViewportEnabled(enabled); | 700 m_settings->setViewportEnabled(enabled); |
| 687 } | 701 } |
| 688 | 702 |
| 703 void WebSettingsImpl::setViewportMetaEnabled(bool enabled) |
| 704 { |
| 705 m_settings->setViewportMetaEnabled(enabled); |
| 706 } |
| 707 |
| 689 void WebSettingsImpl::setSyncXHRInDocumentsEnabled(bool enabled) | 708 void WebSettingsImpl::setSyncXHRInDocumentsEnabled(bool enabled) |
| 690 { | 709 { |
| 691 m_settings->setSyncXHRInDocumentsEnabled(enabled); | 710 m_settings->setSyncXHRInDocumentsEnabled(enabled); |
| 692 } | 711 } |
| 693 | 712 |
| 694 void WebSettingsImpl::setCookieEnabled(bool enabled) | 713 void WebSettingsImpl::setCookieEnabled(bool enabled) |
| 695 { | 714 { |
| 696 m_settings->setCookieEnabled(enabled); | 715 m_settings->setCookieEnabled(enabled); |
| 697 } | 716 } |
| 698 | 717 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 void WebSettingsImpl::setPinchVirtualViewportEnabled(bool enabled) | 758 void WebSettingsImpl::setPinchVirtualViewportEnabled(bool enabled) |
| 740 { | 759 { |
| 741 m_settings->setPinchVirtualViewportEnabled(enabled); | 760 m_settings->setPinchVirtualViewportEnabled(enabled); |
| 742 } | 761 } |
| 743 | 762 |
| 744 void WebSettingsImpl::setUseSolidColorScrollbars(bool enabled) | 763 void WebSettingsImpl::setUseSolidColorScrollbars(bool enabled) |
| 745 { | 764 { |
| 746 m_settings->setUseSolidColorScrollbars(enabled); | 765 m_settings->setUseSolidColorScrollbars(enabled); |
| 747 } | 766 } |
| 748 | 767 |
| 768 void WebSettingsImpl::setMainFrameResizesAreOrientationChanges(bool enabled) |
| 769 { |
| 770 m_mainFrameResizesAreOrientationChanges = enabled; |
| 771 } |
| 772 |
| 749 } // namespace WebKit | 773 } // namespace WebKit |
| OLD | NEW |