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

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

Issue 34353004: Enabled link highlights on windows (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebaselines for pixel tests Created 7 years, 2 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
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 break; 692 break;
693 } 693 }
694 694
695 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even t); 695 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even t);
696 696
697 // Handle link highlighting outside the main switch to avoid getting lost in the 697 // Handle link highlighting outside the main switch to avoid getting lost in the
698 // complicated set of cases handled below. 698 // complicated set of cases handled below.
699 switch (eventType) { 699 switch (eventType) {
700 case WebInputEvent::GestureShowPress: 700 case WebInputEvent::GestureShowPress:
701 // Queue a highlight animation, then hand off to regular handler. 701 // Queue a highlight animation, then hand off to regular handler.
702 #if OS(LINUX) || OS(ANDROID)
703 if (settingsImpl()->gestureTapHighlightEnabled()) 702 if (settingsImpl()->gestureTapHighlightEnabled())
704 enableTapHighlightAtPoint(platformEvent); 703 enableTapHighlightAtPoint(platformEvent);
705 #endif
706 break; 704 break;
707 case WebInputEvent::GestureTapCancel: 705 case WebInputEvent::GestureTapCancel:
708 case WebInputEvent::GestureTap: 706 case WebInputEvent::GestureTap:
709 case WebInputEvent::GestureLongPress: 707 case WebInputEvent::GestureLongPress:
710 for (size_t i = 0; i < m_linkHighlights.size(); ++i) 708 for (size_t i = 0; i < m_linkHighlights.size(); ++i)
711 m_linkHighlights[i]->startHighlightAnimationIfNeeded(); 709 m_linkHighlights[i]->startHighlightAnimationIfNeeded();
712 break; 710 break;
713 default: 711 default:
714 break; 712 break;
715 } 713 }
(...skipping 3411 matching lines...) Expand 10 before | Expand all | Expand 10 after
4127 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4125 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4128 4126
4129 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4127 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4130 return false; 4128 return false;
4131 4129
4132 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4130 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4133 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4131 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4134 } 4132 }
4135 4133
4136 } // namespace WebKit 4134 } // namespace WebKit
OLDNEW
« no previous file with comments | « LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698