Merge lp:~abreu-alexandre/oxide/vibrate into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Implement vibrate() backend.

Implement vibrate() backend.

[David Barth (dbarth)]

Chris: can you give us some feedback on what is holding this branch from being merged in?

[Chris Coulson (chrisccoulson)]

I've left some comments inline

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Thanks, there's a couple of small comments inline

review: Needs Fixing

[lp:~abreu-alexandre/oxide/vibrate]

1273. By Chris Coulson on 2015-11-19

Merge from lp:oxide/crmaster

This fixes LP: #1336440 by pulling Chromium and some modified sub-projects from GIT repositories hosted on Launchpad.
With this, the workflow for updating Chromium and applying modifications to Chromium or its subprojects changes significantly. Documentation for this will be coming...

Also, client.py has been renamed to init-checkout.py - the original name came from the script used to check out Thunderbird, but it's never really made sense

1274. By Chris Coulson on 2015-11-19

WebView.loading changing to false appears to be the last event in a load now, so update the tests to reflect this

1275. By Chris Coulson on 2015-11-19

Enable NEON unconditionally on arm. This means we don't have to modify webrtc and openmax

1276. By Chris Coulson on 2015-11-20

Bump Chromium rev to 48.0.2564.8

1277. By Chris Coulson on 2015-11-20

Bump Chromium rev to b1bedd5f

1278. By Chris Coulson on 2015-11-20

Bump Chromium rev to 4c09f100 (merge from 48.0.2564.10)

1279. By Olivier Tilloy on 2015-11-20

Correctly report when the webview has actual active focus (check that its parent window is active).

1280. By Chris Coulson on 2015-11-20

Delete StoragePermissionRequest and make WebContext.storageAccessPermissionDelegate a noop. This functionality has never been tested, it wasn't finished to a standard that would make it useful anywhere, nobody is using it and it's going to get in the way of site-settings

[Alexandre Abreu (abreu-alexandre)]

updated

(and see reply to comment)

[lp:~abreu-alexandre/oxide/vibrate]

1281. By Olivier Tilloy on 2015-11-23

Add a hoveredUrl property to the QML WebView API.

1282. By Chris Coulson on 2015-11-26

Fix a typo

1283. By Chris Coulson on 2015-11-26

Use Qt::PrimaryOrientation rather than passing in QScreen's own primary orientation

1284. By Chris Coulson on 2015-11-27

QCoreApplication::applicationName() isn't really thread-safe - cache it to protect against accessing this whilst the application is modifying it (although we don't really expect this to change)

1285. By Chris Coulson on 2015-12-04

Build with 'use_ash: 0' as this seems to be pulling in dependencies from //chrome, resulting in random mis-builds

1286. By Chris Coulson on 2015-12-09

Bump Chromium rev to 0fcc1746 (48.0.2564.22)

1287. By Chris Coulson on 2015-12-09

Add support for the camera on the phone. Note this requires changes to libhybris that aren't approved yet, so some bits may change. It's also hidden behind a build option (ENABLE_HYBRIS_CAMERA)

[Chris Coulson (chrisccoulson)]

I've replied to the comment - this code doesn't really make sense

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Helps if I include the comment

[lp:~abreu-alexandre/oxide/vibrate]

1288. By Chris Coulson on 2015-12-11

Don't require libhybris-dev to be installed when building without ENABLE_HYBRIS_CAMERA

1289. By Chris Coulson on 2015-12-16

Merge from lp:oxide/crmaster

1290. By Chris Coulson on 2015-12-16

Bump qt version to 1.13

1291. By Chris Coulson on 2015-12-17

Bump Chromium rev to dee8b819 (49.0.2587.3)

1292. By Chris Coulson on 2015-12-19

Fix OxideQCertificateError::isMainFrame to work with Chromium 49

1293. By Chris Coulson on 2015-12-22

Don't build qt/core/api in a separate target with different build options. This means we can stop linking unconditionally with --gc-sections. It also means that the public API no longer has RTTI enabled - if we need this in the future, we'll have to split it out again and plumb it through a proxy layer like we do with qt/quick/api

1294. By Chris Coulson on 2016-01-04

Merge r1067 from lp:oxide/crmaster

1295. By Chris Coulson on 2016-01-04

Bump Chromium rev to 8af47bb2 (49.0.2593.0)

1296. By Chris Coulson on 2016-01-04

Bump Chromium rev to a6f2995b to pick up build fix

1297. By Chris Coulson on 2016-01-06

Pass StartParams by value and give it a move constructor - this makes it obvious that the StartParams passed to BrowserProcessMain::Start is no longer valid once the function returns

1298. By Chris Coulson on 2016-01-07

Merge r1072 from lp:oxide/crmaster

1299. By Chris Coulson on 2016-01-07

Bump Chromium rev to 3bbb11d8 (49.0.2612.0)

1300. By Chris Coulson on 2016-01-08

Check the return value from android_camera_get_device_info

1301. By Chris Coulson on 2016-01-08

Check the return of android_camera_get_device_info in another location

1302. By Chris Coulson on 2016-01-08

Fix an import failure in release.py

1303. By Chris Coulson on 2016-01-08

Update the exclude list and call init-checkout.py from release.py

1304. By Olivier Tilloy on 2016-01-08

Add missing revision qualifier to the WebView.hoveredUrl property.

1305. By Chris Coulson on 2016-01-08

Be a bit more intelligent when detecting whether the hybris camera compatibility layer is available, or whether we're running on the Android EGL stack

1306. By Chris Coulson on 2016-01-09

Expose value type enums to QML in Qt5.5

1307. By Olivier Tilloy on 2016-01-11

Update to oxide.qmltypes missed at revision 1304.

1308. By Chris Coulson on 2016-01-11

Don't include .git/index files anywhere in the tarball. This was added way back in r640 but doesn't actually fix anything, and instead causes LP: #1490868 to be reintroduced in official builds where we don't install git

1309. By Olivier Tilloy on 2016-01-12

Add a touch selection API, to allow embedders to display handles for resizing the current selection, and contextual actions for it.

1310. By Chris Coulson on 2016-01-12

Make QFlags naming consistent betweeen qt/core/api and qt/quick/api

1311. By Chris Coulson on 2016-01-13

Various clean-ups in soon-to-be-public headers. Also, we rename header files based on whether they're going to be public or not

1312. By Chris Coulson on 2016-01-13

Ensure we define OXIDE_QTQUICK_IMPLEMENTATION as part of the build

1313. By Chris Coulson on 2016-01-13

Remove SimplePermissionRequest

1314. By Chris Coulson on 2016-01-13

Register PermissionRequest and MediaAccessPermissionRequest

1315. By Chris Coulson on 2016-01-13

Add deprecation warnings for deprecated APIs

1316. By Chris Coulson on 2016-01-14

Add missing file

1317. By Chris Coulson on 2016-01-15

Disable the unprivileged namespace sandbox and fallback to the suid sandbox until we've figured out how it fits in with application confinement

1318. By Chris Coulson on 2016-01-18

Make a few changes to the build system:
- package is renamed to test-package, as the former is a reserved target in cmake. This gets rid of a warning.
- Use the built-in option command.
- Move a bunch of stuff from qt/CMakeLists.txt to CMakeLists.txt

1319. By Chris Coulson on 2016-01-19

Use INTERFACE_LINK_LIBRARIES for OXIDE_LIB, and make some libraries linked in to OXIDE_QUICKLIB public

1320. By Chris Coulson on 2016-01-19

Merge r1085 from lp:oxide/crmaster

1321. By Chris Coulson on 2016-01-20

Bump Chromium rev to c51aaef (49.0.2623.0)

1322. By Chris Coulson on 2016-01-20

Unbreak cross-compiles and make sure we test the version of the correct module

1323. By Chris Coulson on 2016-01-21

Merge in various build changes:
- Split out some code in to CMake modules
- Use CMake's PROJECT_VERSION properties rather than our own OXIDE_VERSION
- Install public header files
- Create and install CMake package config files

1324. By Chris Coulson on 2016-01-22

Safely handle event loop nesting from outside of Oxide

1325. By Chris Coulson on 2016-01-25

Bump Chromium rev to 37948b2 (49.0.2623.13)

1326. By Chris Coulson on 2016-01-26

Update the deprecation warning for loadingChanged and add a macro for doing this as well

1327. By Chris Coulson on 2016-01-27

Bump Chromium rev to 8e193e1 (49.0.2623.23)

1328. By Alexandre Abreu on 2016-02-01

Vibration API support

1329. By Alexandre Abreu on 2016-02-01

Undo local build specific commit

[Chris Coulson (chrisccoulson)]

review: Approve

[David Barth (dbarth)]

And there was /much/ rejoicing ! :) Great to see this branch in trunk.

On Thu, Feb 11, 2016 at 8:00 PM, Chris Coulson <email address hidden>
wrote:

> Review: Approve
>
>
> --
> https://code.launchpad.net/~abreu-alexandre/oxide/vibrate/+merge/261768
> Your team Oxide Developers is subscribed to branch lp:oxide.
>

=== modified file 'qt/build/system.gyp'
--- qt/build/system.gyp	2015-10-28 19:09:39 +0000
+++ qt/build/system.gyp	2016-02-01 20:21:37 +0000
@@ -107,5 +107,22 @@
         ],
       },
     },
+    {
+      'target_name': 'Qt5Feedback',
+      'type': 'none',
+      'direct_dependent_settings': {
+        'cflags_cc': [
+          '<!@(<(pkg_config) --cflags Qt5Feedback)'
+        ]
+      },
+      'link_settings': {
+        'ldflags': [
+          '<!@(<(pkg_config) --libs-only-L --libs-only-other Qt5Feedback)',
+        ],
+        'libraries': [
+          '<!@(<(pkg_config) --libs-only-l Qt5Feedback)',
+        ],
+      },
+    },
   ],
 }

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.cc'
--- qt/core/browser/oxide_qt_browser_platform_integration.cc	2016-01-08 21:01:08 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.cc	2016-02-01 20:21:37 +0000
@@ -44,6 +44,7 @@
 #include "oxide_qt_location_provider.h"
 #include "oxide_qt_message_pump.h"
 #include "oxide_qt_screen_utils.h"
+#include "oxide_qt_vibration_manager.h"
 
 namespace oxide {
 namespace qt {
@@ -242,6 +243,11 @@
   qApp->removeEventFilter(this);
 }
 
+void BrowserPlatformIntegration::CreateVibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request) {
+  VibrationManager::Create(std::move(request));
+}
+
 QThread* GetIOQThread() {
   return g_io_thread.Get();
 }

=== modified file 'qt/core/browser/oxide_qt_browser_platform_integration.h'
--- qt/core/browser/oxide_qt_browser_platform_integration.h	2015-12-11 17:01:08 +0000
+++ qt/core/browser/oxide_qt_browser_platform_integration.h	2016-02-01 20:21:37 +0000
@@ -64,6 +64,8 @@
   scoped_ptr<content::LocationProvider> CreateLocationProvider() override;
   ApplicationState GetApplicationState() override;
   std::string GetApplicationName() override;
+  void CreateVibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request) override;
 
   // QObject implementation
   bool eventFilter(QObject* watched, QEvent* event) override;

=== added file 'qt/core/browser/oxide_qt_vibration_manager.cc'
--- qt/core/browser/oxide_qt_vibration_manager.cc	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_vibration_manager.cc	2016-02-01 20:21:37 +0000
@@ -0,0 +1,57 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#include "oxide_qt_vibration_manager.h"
+
+#include "base/logging.h"
+
+#include <QFeedbackHapticsEffect>
+
+namespace oxide {
+namespace qt {
+
+namespace {
+const double kVibrationIntensity = 1.0;
+}
+
+// static
+void VibrationManager::Create(mojo::InterfaceRequest<device::VibrationManager> request) {
+  new VibrationManager(std::move(request));
+}
+
+VibrationManager::VibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request)
+  : binding_(this, std::move(request)),
+    vibration_(new QFeedbackHapticsEffect()) {
+}
+VibrationManager::~VibrationManager() {}
+
+void VibrationManager::Vibrate(int64_t milliseconds) {
+  Cancel();
+
+  vibration_->setIntensity(kVibrationIntensity);
+  vibration_->setDuration(milliseconds);
+  vibration_->start();
+}
+
+void VibrationManager::Cancel() {
+  vibration_->stop();
+}
+
+} // namespace qt
+} // namespace oxide
+

=== added file 'qt/core/browser/oxide_qt_vibration_manager.h'
--- qt/core/browser/oxide_qt_vibration_manager.h	1970-01-01 00:00:00 +0000
+++ qt/core/browser/oxide_qt_vibration_manager.h	2016-02-01 20:21:37 +0000
@@ -0,0 +1,56 @@
+// vim:expandtab:shiftwidth=2:tabstop=2:
+// Copyright (C) 2015 Canonical Ltd.
+
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef _OXIDE_QT_CORE_BROWSER_VIBRATION_MANAGER_H_
+#define _OXIDE_QT_CORE_BROWSER_VIBRATION_MANAGER_H_
+
+#include <QtGlobal>
+
+#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+
+#include "mojo/public/cpp/bindings/strong_binding.h"
+
+#include "device/vibration/vibration_manager_impl.h"
+
+QT_BEGIN_NAMESPACE
+class QFeedbackHapticsEffect;
+QT_END_NAMESPACE
+
+namespace oxide {
+namespace qt {
+
+class VibrationManager : public device::VibrationManager {
+ public:
+  static void Create(mojo::InterfaceRequest<device::VibrationManager> request);
+
+  void Vibrate(int64_t milliseconds) override;
+  void Cancel() override;
+
+ private:
+  VibrationManager(mojo::InterfaceRequest<device::VibrationManager> request);
+  ~VibrationManager() override;
+
+  mojo::StrongBinding<device::VibrationManager> binding_;
+  scoped_ptr<QFeedbackHapticsEffect> vibration_;
+};
+
+} // namespace qt
+} // namespace oxide
+
+#endif // _OXIDE_QT_CORE_BROWSER_VIBRATION_MANAGER_H_
+

=== modified file 'qt/core/core.gyp'
--- qt/core/core.gyp	2016-01-20 21:40:55 +0000
+++ qt/core/core.gyp	2016-02-01 20:21:37 +0000
@@ -27,6 +27,7 @@
       'dependencies': [
         '../build/system.gyp:Qt5Core',
         '../build/system.gyp:Qt5Core-private',
+        '../build/system.gyp:Qt5Feedback',
         '../build/system.gyp:Qt5Gui',
         '../build/system.gyp:Qt5Gui-private',
         '../build/system.gyp:Qt5Network',
@@ -158,6 +159,8 @@
         'browser/oxide_qt_user_script.h',
         'browser/oxide_qt_variant_value_converter.cc',
         'browser/oxide_qt_variant_value_converter.h',
+        'browser/oxide_qt_vibration_manager.cc',
+        'browser/oxide_qt_vibration_manager.h',
         'browser/oxide_qt_web_context.cc',
         'browser/oxide_qt_web_context.h',
         'browser/oxide_qt_web_context_menu.cc',

=== modified file 'shared/browser/oxide_browser_platform_integration.cc'
--- shared/browser/oxide_browser_platform_integration.cc	2015-12-11 17:01:08 +0000
+++ shared/browser/oxide_browser_platform_integration.cc	2016-02-01 20:21:37 +0000
@@ -107,4 +107,8 @@
                     ClipboardDataChanged());
 }
 
+void BrowserPlatformIntegration::CreateVibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request) {
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_browser_platform_integration.h'
--- shared/browser/oxide_browser_platform_integration.h	2015-12-11 17:01:08 +0000
+++ shared/browser/oxide_browser_platform_integration.h	2016-02-01 20:21:37 +0000
@@ -24,6 +24,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "content/public/browser/browser_thread.h"
+#include "device/vibration/vibration_manager_impl.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 
 class GURL;
@@ -105,6 +106,10 @@
   // Get the application name. Can be called on any thread
   virtual std::string GetApplicationName();
 
+  // Get the proper vibration manager factory
+  virtual void CreateVibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request);
+
  protected:
   BrowserPlatformIntegration();
 

=== modified file 'shared/browser/oxide_content_browser_client.cc'
--- shared/browser/oxide_content_browser_client.cc	2016-01-08 21:31:20 +0000
+++ shared/browser/oxide_content_browser_client.cc	2016-02-01 20:21:37 +0000
@@ -25,6 +25,7 @@
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/public/common/service_registry.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/geolocation_provider.h"
 #include "content/public/browser/location_provider.h"
@@ -34,6 +35,7 @@
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/web_preferences.h"
+#include "device/vibration/vibration_manager_impl.h"
 
 #include "shared/browser/compositor/oxide_compositor_utils.h"
 #include "shared/browser/media/oxide_media_capture_devices_dispatcher.h"
@@ -67,6 +69,16 @@
 #include "pepper/oxide_pepper_host_factory_browser.h"
 #endif
 
+namespace {
+
+void CreateVibrationManager(
+      mojo::InterfaceRequest<device::VibrationManager> request) {
+  oxide::BrowserPlatformIntegration::GetInstance()
+    ->CreateVibrationManager(std::move(request));
+}
+
+}
+
 namespace oxide {
 
 content::BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
@@ -306,6 +318,12 @@
   return application_locale_;
 }
 
+void ContentBrowserClient::RegisterRenderProcessMojoServices(
+      content::ServiceRegistry* registry) {
+  DCHECK(registry);
+  registry->AddService(base::Bind(&CreateVibrationManager));
+}
+
 ContentBrowserClient::ContentBrowserClient(
     const std::string& application_locale,
     BrowserPlatformIntegration* integration)

=== modified file 'shared/browser/oxide_content_browser_client.h'
--- shared/browser/oxide_content_browser_client.h	2015-12-19 00:53:56 +0000
+++ shared/browser/oxide_content_browser_client.h	2016-02-01 20:21:37 +0000
@@ -118,6 +118,7 @@
   void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) final;
   gpu::GpuControlList::OsType GetOsTypeOverrideForGpuDataManager(
       std::string* os_version) final;
+  void RegisterRenderProcessMojoServices(content::ServiceRegistry* registry) final;
 
   std::string application_locale_;
   scoped_ptr<BrowserPlatformIntegration> platform_integration_;