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

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

Issue 23691071: OS(ANDROID) should not imply OS(LINUX) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Refactor OS macros to have exclusive priority order 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 | « Source/web/PopupListBox.cpp ('k') | Source/web/linux/WebFontRendering.cpp » ('j') | 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 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 break; 704 break;
705 } 705 }
706 706
707 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even t); 707 PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), even t);
708 708
709 // Handle link highlighting outside the main switch to avoid getting lost in the 709 // Handle link highlighting outside the main switch to avoid getting lost in the
710 // complicated set of cases handled below. 710 // complicated set of cases handled below.
711 switch (event.type) { 711 switch (event.type) {
712 case WebInputEvent::GestureTapDown: 712 case WebInputEvent::GestureTapDown:
713 // Queue a highlight animation, then hand off to regular handler. 713 // Queue a highlight animation, then hand off to regular handler.
714 #if OS(LINUX) 714 #if OS(LINUX) || OS(ANDROID)
715 if (settingsImpl()->gestureTapHighlightEnabled()) 715 if (settingsImpl()->gestureTapHighlightEnabled())
716 enableTapHighlightAtPoint(platformEvent); 716 enableTapHighlightAtPoint(platformEvent);
717 #endif 717 #endif
718 break; 718 break;
719 case WebInputEvent::GestureTapCancel: 719 case WebInputEvent::GestureTapCancel:
720 case WebInputEvent::GestureTap: 720 case WebInputEvent::GestureTap:
721 case WebInputEvent::GestureLongPress: 721 case WebInputEvent::GestureLongPress:
722 for (size_t i = 0; i < m_linkHighlights.size(); ++i) 722 for (size_t i = 0; i < m_linkHighlights.size(); ++i)
723 m_linkHighlights[i]->startHighlightAnimationIfNeeded(); 723 m_linkHighlights[i]->startHighlightAnimationIfNeeded();
724 break; 724 break;
(...skipping 3478 matching lines...) Expand 10 before | Expand all | Expand 10 after
4203 // the initial viewport width. 4203 // the initial viewport width.
4204 // 2. The author has disabled viewport zoom. 4204 // 2. The author has disabled viewport zoom.
4205 4205
4206 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4206 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4207 4207
4208 return fixedLayoutSize().width == m_size.width 4208 return fixedLayoutSize().width == m_size.width
4209 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4209 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4210 } 4210 }
4211 4211
4212 } // namespace WebKit 4212 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/web/PopupListBox.cpp ('k') | Source/web/linux/WebFontRendering.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698