| OLD | NEW |
| 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 29 matching lines...) Expand all Loading... |
| 40 #include "Chrome.h" | 40 #include "Chrome.h" |
| 41 #include "Color.h" | 41 #include "Color.h" |
| 42 #include "ColorSpace.h" | 42 #include "ColorSpace.h" |
| 43 #include "CompositionUnderlineVectorBuilder.h" | 43 #include "CompositionUnderlineVectorBuilder.h" |
| 44 #include "ContextFeaturesClientImpl.h" | 44 #include "ContextFeaturesClientImpl.h" |
| 45 #include "ContextMenu.h" | 45 #include "ContextMenu.h" |
| 46 #include "ContextMenuController.h" | 46 #include "ContextMenuController.h" |
| 47 #include "ContextMenuItem.h" | 47 #include "ContextMenuItem.h" |
| 48 #include "Cursor.h" | 48 #include "Cursor.h" |
| 49 #include "DOMUtilitiesPrivate.h" | 49 #include "DOMUtilitiesPrivate.h" |
| 50 #include "DeviceMotionController.h" |
| 50 #include "DeviceOrientationClientProxy.h" | 51 #include "DeviceOrientationClientProxy.h" |
| 51 #include "Document.h" | 52 #include "Document.h" |
| 52 #include "DocumentLoader.h" | 53 #include "DocumentLoader.h" |
| 53 #include "DragController.h" | 54 #include "DragController.h" |
| 54 #include "DragData.h" | 55 #include "DragData.h" |
| 55 #include "DragSession.h" | 56 #include "DragSession.h" |
| 56 #include "Editor.h" | 57 #include "Editor.h" |
| 57 #include "EventHandler.h" | 58 #include "EventHandler.h" |
| 58 #include "Extensions3D.h" | 59 #include "Extensions3D.h" |
| 59 #include "FocusController.h" | 60 #include "FocusController.h" |
| (...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); | 486 provideSpeechRecognitionTo(m_page.get(), m_speechRecognitionClient.get()); |
| 486 #endif | 487 #endif |
| 487 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) | 488 #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS) |
| 488 provideNotification(m_page.get(), notificationPresenterImpl()); | 489 provideNotification(m_page.get(), notificationPresenterImpl()); |
| 489 #endif | 490 #endif |
| 490 #if ENABLE(NAVIGATOR_CONTENT_UTILS) | 491 #if ENABLE(NAVIGATOR_CONTENT_UTILS) |
| 491 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g
et()); | 492 provideNavigatorContentUtilsTo(m_page.get(), m_navigatorContentUtilsClient.g
et()); |
| 492 #endif | 493 #endif |
| 493 | 494 |
| 494 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); | 495 provideContextFeaturesTo(m_page.get(), m_featureSwitchClient.get()); |
| 496 provideDeviceMotionTo(m_page.get()); |
| 495 provideDeviceOrientationTo(m_page.get(), m_deviceOrientationClientProxy.get(
)); | 497 provideDeviceOrientationTo(m_page.get(), m_deviceOrientationClientProxy.get(
)); |
| 496 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); | 498 provideGeolocationTo(m_page.get(), m_geolocationClientProxy.get()); |
| 497 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); | 499 m_geolocationClientProxy->setController(GeolocationController::from(m_page.g
et())); |
| 498 | 500 |
| 499 #if ENABLE(BATTERY_STATUS) | 501 #if ENABLE(BATTERY_STATUS) |
| 500 provideBatteryTo(m_page.get(), m_batteryClient.get()); | 502 provideBatteryTo(m_page.get(), m_batteryClient.get()); |
| 501 m_batteryClient->setController(BatteryController::from(m_page.get())); | 503 m_batteryClient->setController(BatteryController::from(m_page.get())); |
| 502 #endif | 504 #endif |
| 503 | 505 |
| 504 m_page->setGroupName(pageGroupName); | 506 m_page->setGroupName(pageGroupName); |
| (...skipping 3776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4281 #endif | 4283 #endif |
| 4282 | 4284 |
| 4283 bool WebViewImpl::shouldDisableDesktopWorkarounds() | 4285 bool WebViewImpl::shouldDisableDesktopWorkarounds() |
| 4284 { | 4286 { |
| 4285 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); | 4287 ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewport
Arguments(); |
| 4286 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom | 4288 return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.
userZoom |
| 4287 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); | 4289 || (arguments.minZoom == arguments.maxZoom && arguments.minZoom != Viewp
ortArguments::ValueAuto); |
| 4288 } | 4290 } |
| 4289 | 4291 |
| 4290 } // namespace WebKit | 4292 } // namespace WebKit |
| OLD | NEW |