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

Side by Side Diff: Source/WebKit/chromium/src/WebViewImpl.cpp

Issue 13818030: Added primary input devices setting to blink to allow media queries for hover/pointer (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Review fixes Created 7 years, 8 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/WebKit/chromium/src/WebSettingsImpl.cpp ('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 3496 matching lines...) Expand 10 before | Expand all | Expand 10 after
3507 // The first time the Autofill popup is shown we'll create the client and 3507 // The first time the Autofill popup is shown we'll create the client and
3508 // the popup. 3508 // the popup.
3509 if (!m_autofillPopupClient) 3509 if (!m_autofillPopupClient)
3510 m_autofillPopupClient = adoptPtr(new AutofillPopupMenuClient); 3510 m_autofillPopupClient = adoptPtr(new AutofillPopupMenuClient);
3511 3511
3512 m_autofillPopupClient->initialize( 3512 m_autofillPopupClient->initialize(
3513 inputElem, names, labels, icons, itemIDs, separatorIndex); 3513 inputElem, names, labels, icons, itemIDs, separatorIndex);
3514 3514
3515 if (!m_autofillPopup) { 3515 if (!m_autofillPopup) {
3516 PopupContainerSettings popupSettings = autofillPopupSettings; 3516 PopupContainerSettings popupSettings = autofillPopupSettings;
3517 popupSettings.deviceSupportsTouch = settingsImpl()->deviceSupportsTouch( ); 3517 popupSettings.primaryInputIncludesTouch = settingsImpl()->primaryPointer Devices() & WebSettings::PointerDeviceTouch;
3518 m_autofillPopup = PopupContainer::create(m_autofillPopupClient.get(), 3518 m_autofillPopup = PopupContainer::create(m_autofillPopupClient.get(),
3519 PopupContainer::Suggestion, 3519 PopupContainer::Suggestion,
3520 popupSettings); 3520 popupSettings);
3521 } 3521 }
3522 3522
3523 if (m_autofillPopupShowing) { 3523 if (m_autofillPopupShowing) {
3524 refreshAutofillPopup(); 3524 refreshAutofillPopup();
3525 } else { 3525 } else {
3526 m_autofillPopupShowing = true; 3526 m_autofillPopupShowing = true;
3527 m_autofillPopup->showInRect(focusedNode->pixelSnappedBoundingBox(), focu sedNode->ownerDocument()->view(), 0); 3527 m_autofillPopup->showInRect(focusedNode->pixelSnappedBoundingBox(), focu sedNode->ownerDocument()->view(), 0);
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
4239 #endif 4239 #endif
4240 4240
4241 bool WebViewImpl::shouldDisableDesktopWorkarounds() 4241 bool WebViewImpl::shouldDisableDesktopWorkarounds()
4242 { 4242 {
4243 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments(); 4243 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport Arguments();
4244 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom 4244 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments. userZoom
4245 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto); 4245 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp ortArguments::ValueAuto);
4246 } 4246 }
4247 4247
4248 } // namespace WebKit 4248 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebSettingsImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698