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

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

Issue 889803004: Add touchpad pinch zoom support to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Update tests Created 5 years, 10 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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 webframe->didChangeContentsSize(size); 522 webframe->didChangeContentsSize(size);
523 523
524 frame->loader().restoreScrollPositionAndViewState(); 524 frame->loader().restoreScrollPositionAndViewState();
525 } 525 }
526 526
527 void ChromeClientImpl::pageScaleFactorChanged() const 527 void ChromeClientImpl::pageScaleFactorChanged() const
528 { 528 {
529 m_webView->pageScaleFactorChanged(); 529 m_webView->pageScaleFactorChanged();
530 } 530 }
531 531
532 float ChromeClientImpl::clampPageScaleFactorToLimits(float scale) const
533 {
534 return m_webView->clampPageScaleFactorToLimits(scale);
535 }
536
532 void ChromeClientImpl::layoutUpdated(LocalFrame* frame) const 537 void ChromeClientImpl::layoutUpdated(LocalFrame* frame) const
533 { 538 {
534 m_webView->layoutUpdated(WebLocalFrameImpl::fromFrame(frame)); 539 m_webView->layoutUpdated(WebLocalFrameImpl::fromFrame(frame));
535 } 540 }
536 541
537 void ChromeClientImpl::mouseDidMoveOverElement(const HitTestResult& result) 542 void ChromeClientImpl::mouseDidMoveOverElement(const HitTestResult& result)
538 { 543 {
539 if (!m_webView->client()) 544 if (!m_webView->client())
540 return; 545 return;
541 546
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t)); 886 webframe->autofillClient()->dataListOptionsChanged(WebInputElement(&inpu t));
882 } 887 }
883 888
884 void ChromeClientImpl::registerViewportLayers() const 889 void ChromeClientImpl::registerViewportLayers() const
885 { 890 {
886 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled()) 891 if (m_webView->rootGraphicsLayer() && m_webView->layerTreeView() && m_webVie w->pinchVirtualViewportEnabled())
887 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView()); 892 m_webView->page()->frameHost().pinchViewport().registerLayersWithTreeVie w(m_webView->layerTreeView());
888 } 893 }
889 894
890 } // namespace blink 895 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698