diff -Nru oxide-qt-1.3.4/CHROMIUM_VERSION oxide-qt-1.3.5/CHROMIUM_VERSION
--- oxide-qt-1.3.4/CHROMIUM_VERSION	2014-11-13 00:46:20.000000000 +0000
+++ oxide-qt-1.3.5/CHROMIUM_VERSION	2014-11-18 19:02:24.000000000 +0000
@@ -1 +1 @@
-39.0.2171.62
+39.0.2171.65
diff -Nru oxide-qt-1.3.4/debian/changelog oxide-qt-1.3.5/debian/changelog
--- oxide-qt-1.3.4/debian/changelog	2014-11-17 11:31:06.000000000 +0000
+++ oxide-qt-1.3.5/debian/changelog	2014-11-20 12:09:06.000000000 +0000
@@ -1,3 +1,12 @@
+oxide-qt (1.3.5-0ubuntu0.14.10.1~rtm) utopic; urgency=medium
+
+  * Update to v1.3.5
+    - Bump Chromium rev to 39.0.2171.65
+    - Really fix LP: #1391230 - Release the screen dim lock when the
+      application becomes inactive
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Thu, 20 Nov 2014 11:01:29 +0000
+
 oxide-qt (1.3.4-0ubuntu0.14.10.1) utopic-security; urgency=medium
 
   * Update to v1.3.4
diff -Nru oxide-qt-1.3.4/qt/VERSION oxide-qt-1.3.5/qt/VERSION
--- oxide-qt-1.3.4/qt/VERSION	2014-11-17 10:57:57.000000000 +0000
+++ oxide-qt-1.3.5/qt/VERSION	2014-11-20 10:19:46.000000000 +0000
@@ -1,3 +1,3 @@
 MAJOR=1
 MINOR=3
-PATCH=4
\ No newline at end of file
+PATCH=5
\ No newline at end of file
diff -Nru oxide-qt-1.3.4/shared/browser/oxide_power_save_blocker.cc oxide-qt-1.3.5/shared/browser/oxide_power_save_blocker.cc
--- oxide-qt-1.3.4/shared/browser/oxide_power_save_blocker.cc	2014-11-17 10:57:36.000000000 +0000
+++ oxide-qt-1.3.5/shared/browser/oxide_power_save_blocker.cc	2014-11-20 10:19:11.000000000 +0000
@@ -40,6 +40,7 @@
 const char kUnityScreenServiceName[] = "com.canonical.Unity.Screen";
 const char kUnityScreenPath[] = "/com/canonical/Unity/Screen";
 const char kUnityScreenInterface[] = "com.canonical.Unity.Screen";
+const int kInvalidCookie = -1;
 
 }
 
@@ -71,7 +72,7 @@
 
 PowerSaveBlockerImpl::Delegate::Delegate() :
     form_factor_(oxide::GetFormFactorHint()),
-    cookie_(0) {}
+    cookie_(kInvalidCookie) {}
 
 void PowerSaveBlockerImpl::Delegate::Init() {
   if (oxide::PlatformIntegration::GetInstance()->GetApplicationState() ==
@@ -127,7 +128,7 @@
 
   if (form_factor_ == oxide::FORM_FACTOR_PHONE ||
       form_factor_ == oxide::FORM_FACTOR_TABLET) {
-    if (cookie_ != 0) {
+    if (cookie_ != kInvalidCookie) {
       DCHECK(bus_.get());
       scoped_refptr<dbus::ObjectProxy> object_proxy = bus_->GetObjectProxy(
           kUnityScreenServiceName,
@@ -139,7 +140,7 @@
       message_writer.AppendInt32(cookie_);
       object_proxy->CallMethodAndBlock(
           method_call.get(), dbus::ObjectProxy::TIMEOUT_USE_DEFAULT);
-      cookie_ = 0;
+      cookie_ = kInvalidCookie;
     }
 
     if (bus_.get()) {
@@ -155,10 +156,10 @@
   oxide::PlatformIntegration::ApplicationState state =
       oxide::PlatformIntegration::GetInstance()->GetApplicationState();
   if ((state == oxide::PlatformIntegration::APPLICATION_STATE_INACTIVE) &&
-      (cookie_ != 0)) {
+      (cookie_ != kInvalidCookie)) {
     CleanUp();
   } else if ((state == oxide::PlatformIntegration::APPLICATION_STATE_ACTIVE) &&
-      (cookie_ == 0)) {
+      (cookie_ == kInvalidCookie)) {
     Init();
   }
 }
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/build/android/pylib/gtest/setup.py oxide-qt-1.3.5/third_party/chromium/src/build/android/pylib/gtest/setup.py
--- oxide-qt-1.3.4/third_party/chromium/src/build/android/pylib/gtest/setup.py	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/build/android/pylib/gtest/setup.py	2014-11-18 17:01:38.000000000 +0000
@@ -118,7 +118,6 @@
       '--config-variable', 'component', 'static_library',
       '--config-variable', 'fastbuild', '0',
       '--config-variable', 'icu_use_data_file_flag', '1',
-      '--config-variable', 'libpeer_target_type', 'static_library',
       # TODO(maruel): This may not be always true.
       '--config-variable', 'target_arch', 'arm',
       '--config-variable', 'use_openssl', '0',
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/build/util/LASTCHANGE oxide-qt-1.3.5/third_party/chromium/src/build/util/LASTCHANGE
--- oxide-qt-1.3.4/third_party/chromium/src/build/util/LASTCHANGE	2014-11-13 00:50:41.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/build/util/LASTCHANGE	2014-11-18 17:01:49.000000000 +0000
@@ -1 +1 @@
-LASTCHANGE=f7560a83e9a887c639578df57203ced4024c0f00
+LASTCHANGE=b853bfefba0da840f4574eb3b5c7ad6e9b8573b5
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/build/util/LASTCHANGE.blink oxide-qt-1.3.5/third_party/chromium/src/build/util/LASTCHANGE.blink
--- oxide-qt-1.3.4/third_party/chromium/src/build/util/LASTCHANGE.blink	2014-11-13 00:50:41.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/build/util/LASTCHANGE.blink	2014-11-18 17:01:49.000000000 +0000
@@ -1 +1 @@
-LASTCHANGE=185156
+LASTCHANGE=185325
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/chrome/browser/sync/test/integration/enable_disable_test.cc oxide-qt-1.3.5/third_party/chromium/src/chrome/browser/sync/test/integration/enable_disable_test.cc
--- oxide-qt-1.3.4/third_party/chromium/src/chrome/browser/sync/test/integration/enable_disable_test.cc	2014-10-09 22:17:12.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/chrome/browser/sync/test/integration/enable_disable_test.cc	2014-11-18 17:01:38.000000000 +0000
@@ -111,6 +111,10 @@
         it.Get() == syncer::SYNCED_NOTIFICATION_APP_INFO)
       continue;
 
+    // Device info cannot be disabled.
+    if (it.Get() == syncer::DEVICE_INFO)
+      continue;
+
     ASSERT_TRUE(GetClient(0)->DisableSyncForDatatype(it.Get()));
 
     // AUTOFILL_PROFILE is lumped together with AUTOFILL.
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/chrome/VERSION oxide-qt-1.3.5/third_party/chromium/src/chrome/VERSION
--- oxide-qt-1.3.4/third_party/chromium/src/chrome/VERSION	2014-11-13 00:50:28.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/chrome/VERSION	2014-11-18 17:01:38.000000000 +0000
@@ -1,4 +1,4 @@
 MAJOR=39
 MINOR=0
 BUILD=2171
-PATCH=62
+PATCH=65
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/components/sync_driver/sync_prefs.cc oxide-qt-1.3.5/third_party/chromium/src/components/sync_driver/sync_prefs.cc
--- oxide-qt-1.3.4/third_party/chromium/src/components/sync_driver/sync_prefs.cc	2014-10-09 22:17:13.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/components/sync_driver/sync_prefs.cc	2014-11-18 17:01:38.000000000 +0000
@@ -66,9 +66,11 @@
   // although they don't have sync representations.
   user_types.PutAll(syncer::ProxyTypes());
 
-  // Treat bookmarks specially.
+  // Treat bookmarks and device info specially.
   RegisterDataTypePreferredPref(registry, syncer::BOOKMARKS, true);
+  RegisterDataTypePreferredPref(registry, syncer::DEVICE_INFO, true);
   user_types.Remove(syncer::BOOKMARKS);
+  user_types.Remove(syncer::DEVICE_INFO);
 
   // These two prefs are set from sync experiment to enable enhanced bookmarks.
   registry->RegisterIntegerPref(
@@ -346,7 +348,7 @@
     default:
       break;
   }
-  NOTREACHED();
+  NOTREACHED() << "Type is " << data_type;
   return NULL;
 }
 
@@ -451,6 +453,11 @@
     NOTREACHED();
     return false;
   }
+
+  // Device info is always enabled.
+  if (pref_name == prefs::kSyncDeviceInfo)
+    return true;
+
   if (type == syncer::PROXY_TABS &&
       pref_service_->GetUserPrefValue(pref_name) == NULL &&
       pref_service_->IsUserModifiablePreference(pref_name)) {
@@ -470,6 +477,11 @@
     NOTREACHED();
     return;
   }
+
+  // Device info is always preferred.
+  if (type == syncer::DEVICE_INFO)
+    return;
+
   pref_service_->SetBoolean(pref_name, is_preferred);
 }
 
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/components/sync_driver/sync_prefs_unittest.cc oxide-qt-1.3.5/third_party/chromium/src/components/sync_driver/sync_prefs_unittest.cc
--- oxide-qt-1.3.4/third_party/chromium/src/components/sync_driver/sync_prefs_unittest.cc	2014-10-09 22:17:13.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/components/sync_driver/sync_prefs_unittest.cc	2014-11-18 17:01:38.000000000 +0000
@@ -68,10 +68,11 @@
   SyncPrefs sync_prefs(&pref_service_);
   sync_prefs.SetKeepEverythingSynced(false);
 
-  // Only bookmarks are enabled by default.
+  // Only bookmarks and device info are enabled by default.
+  syncer::ModelTypeSet expected(syncer::BOOKMARKS, syncer::DEVICE_INFO);
   syncer::ModelTypeSet preferred_types =
       sync_prefs.GetPreferredDataTypes(syncer::UserTypes());
-  EXPECT_TRUE(preferred_types.Equals(syncer::ModelTypeSet(syncer::BOOKMARKS)));
+  EXPECT_TRUE(preferred_types.Equals(expected));
 
   // Simulate an upgrade to delete directives + proxy tabs support. None of the
   // new types or their pref group types should be registering, ensuring they
@@ -164,6 +165,10 @@
       expected_preferred_types.Put(syncer::FAVICON_IMAGES);
       expected_preferred_types.Put(syncer::FAVICON_TRACKING);
     }
+
+    // Device info is always preferred.
+    expected_preferred_types.Put(syncer::DEVICE_INFO);
+
     sync_prefs.SetPreferredDataTypes(user_types, preferred_types);
     EXPECT_TRUE(expected_preferred_types.Equals(
         sync_prefs.GetPreferredDataTypes(user_types)));
@@ -232,6 +237,19 @@
   EXPECT_TRUE(sync_prefs.GetEncryptionBootstrapToken().empty());
 }
 
+// Device info should always be enabled.
+TEST_F(SyncPrefsTest, DeviceInfo) {
+  SyncPrefs sync_prefs(&pref_service_);
+  EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes())
+                  .Has(syncer::DEVICE_INFO));
+  sync_prefs.SetKeepEverythingSynced(true);
+  EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes())
+                  .Has(syncer::DEVICE_INFO));
+  sync_prefs.SetKeepEverythingSynced(false);
+  EXPECT_TRUE(sync_prefs.GetPreferredDataTypes(syncer::UserTypes())
+                  .Has(syncer::DEVICE_INFO));
+}
+
 }  // namespace
 
 }  // namespace sync_driver
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/content/content_tests.gypi oxide-qt-1.3.5/third_party/chromium/src/content/content_tests.gypi
--- oxide-qt-1.3.4/third_party/chromium/src/content/content_tests.gypi	2014-11-13 00:50:28.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/content/content_tests.gypi	2014-11-18 17:01:38.000000000 +0000
@@ -838,21 +838,6 @@
             '../third_party/webrtc/modules/modules.gyp:desktop_capture',
           ],
         }],
-        ['enable_webrtc==1 and OS=="mac"', {
-          'variables': {
-            'libpeer_target_type%': 'static_library',
-          },
-          'conditions': [
-            ['libpeer_target_type!="static_library"', {
-              'copies': [{
-                'destination': '<(PRODUCT_DIR)/Libraries',
-                'files': [
-                  '<(PRODUCT_DIR)/libpeerconnection.so',
-                ],
-              }],
-            }],
-          ],
-        }],
         ['enable_webrtc==1 and chromeos==1', {
           'sources': [
             'browser/media/capture/desktop_capture_device_aura_unittest.cc',
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/content/content_unittests.isolate oxide-qt-1.3.5/third_party/chromium/src/content/content_unittests.isolate
--- oxide-qt-1.3.4/third_party/chromium/src/content/content_unittests.isolate	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/content/content_unittests.isolate	2014-11-18 17:01:38.000000000 +0000
@@ -56,13 +56,6 @@
         ],
       },
     }],
-    ['OS=="linux" and libpeer_target_type=="loadable_module"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/lib/libpeerconnection.so',
-        ],
-      },
-    }],
     ['OS=="mac"', {
       'variables': {
         'command': [
@@ -98,13 +91,6 @@
         ],
       },
     }],
-    ['OS=="win" and libpeer_target_type=="loadable_module"', {
-      'variables': {
-        'isolate_dependency_tracked': [
-          '<(PRODUCT_DIR)/libpeerconnection.dll',
-        ],
-      },
-    }],
   ],
   'includes': [
     '../base/base.isolate',
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/content/renderer/media/media_stream_audio_processor.cc oxide-qt-1.3.5/third_party/chromium/src/content/renderer/media/media_stream_audio_processor.cc
--- oxide-qt-1.3.4/third_party/chromium/src/content/renderer/media/media_stream_audio_processor.cc	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/content/renderer/media/media_stream_audio_processor.cc	2014-11-18 17:01:38.000000000 +0000
@@ -19,7 +19,6 @@
 #include "media/base/audio_fifo.h"
 #include "media/base/channel_layout.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
-#include "third_party/libjingle/overrides/init_webrtc.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
 #include "third_party/webrtc/modules/audio_processing/typing_detection.h"
 
@@ -424,7 +423,7 @@
 #endif
 
   // Create and configure the webrtc::AudioProcessing.
-  audio_processing_.reset(CreateWebRtcAudioProcessing(config));
+  audio_processing_.reset(webrtc::AudioProcessing::Create(config));
 
   // Enable the audio processing components.
   if (echo_cancellation) {
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/content/renderer/media/media_stream_audio_processor_options.cc oxide-qt-1.3.5/third_party/chromium/src/content/renderer/media/media_stream_audio_processor_options.cc
--- oxide-qt-1.3.4/third_party/chromium/src/content/renderer/media/media_stream_audio_processor_options.cc	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/content/renderer/media/media_stream_audio_processor_options.cc	2014-11-18 17:01:38.000000000 +0000
@@ -251,10 +251,15 @@
 void StartEchoCancellationDump(AudioProcessing* audio_processing,
                                base::File aec_dump_file) {
   DCHECK(aec_dump_file.IsValid());
-  if (audio_processing->StartDebugRecordingForPlatformFile(
-      aec_dump_file.TakePlatformFile())) {
-    DLOG(ERROR) << "Fail to start AEC debug recording";
+
+  FILE* stream = base::FileToFILE(aec_dump_file.Pass(), "w");
+  if (!stream) {
+    LOG(ERROR) << "Failed to open AEC dump file";
+    return;
   }
+
+  if (audio_processing->StartDebugRecording(stream))
+    DLOG(ERROR) << "Fail to start AEC debug recording";
 }
 
 void StopEchoCancellationDump(AudioProcessing* audio_processing) {
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/DEPS oxide-qt-1.3.5/third_party/chromium/src/DEPS
--- oxide-qt-1.3.4/third_party/chromium/src/DEPS	2014-11-13 00:50:28.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/DEPS	2014-11-18 17:01:38.000000000 +0000
@@ -156,12 +156,10 @@
     'src/third_party/bidichecker': None,
     'src/third_party/libc++/trunk': None,
     'src/tools/page_cycler/acid3': None,
-    'src/third_party/nss':
-      (Var("git.chromium.org")) + '/chromium/deps/nss.git@87b96db4268293187d7cf741907a6d5d1d8080e0',
     'src/chrome/test/data/perf/canvas_bench': None,
     'src/third_party/libexif/sources': None,
     'src/build/util/support': None,
-    'src/third_party/libc++abi/trunk': None,
+    'src/third_party/libsrtp': None,
     'src/third_party/WebKit/LayoutTests/w3c/csswg-test': None,
     'src/third_party/pymox/src': None,
     'src/media/cdm/ppapi/api': None,
@@ -171,7 +169,9 @@
     'src/third_party/openmax_dl': None,
     'src/third_party/google_toolbox_for_mac/src':
       (Var("git.chromium.org")) + '/external/google-toolbox-for-mac.git@a09526298f9dd1ec49d3b3ac5608d2a257b94cef',
+    'src/third_party/webgl': None,
     'src/third_party/WebKit/LayoutTests/w3c/web-platform-tests': None,
+    'src/third_party/scons-2.0.1': None,
     'src/chrome/test/data/extensions/api_test/permissions/nacl_enabled/bin': None,
     'src/third_party/opus/src': None,
     'src/third_party/webpagereplay': None,
@@ -179,79 +179,79 @@
     'src/native_client': None,
     'src/third_party/usrsctp/usrsctplib': None,
     'src/third_party/brotli/src': None,
-    'src/third_party/webgl': None,
+    'src/third_party/libc++abi/trunk': None,
     'src/third_party/yasm/source/patched-yasm': None,
     'src/testing/iossim/third_party/class-dump':
       (Var("git.chromium.org")) + '/chromium/deps/class-dump.git@89bd40883c767584240b4dade8b74e6f57b9bdab',
-    'src/third_party/libjpeg_turbo': None,
     'src/third_party/cld_2/src': None,
-    'src/third_party/libsrtp': None,
+    'src/third_party/libjpeg_turbo': None,
     'src/third_party/ots': None,
     'src/third_party/ffmpeg': None,
     'src/third_party/hunspell': None,
     'src/third_party/swig/Lib': None,
-    'src/third_party/scons-2.0.1': None
-    },
-    'unix': {
-      'src/third_party/fontconfig/src':
-        (Var("git.chromium.org")) + '/external/fontconfig.git@f16c3118e25546c1b749f9823c51827a60aeb5c1',
-      'build/third_party/cbuildbot_chromite':
-        (Var("git.chromium.org")) + '/chromiumos/chromite.git@1e95b44e033daa6b48e2e9702c5b08a9410f11d8',
-      'src/third_party/cros_system_api':
-        (Var("git.chromium.org")) + '/chromiumos/platform/system_api.git@f0fc55329fa536195861778a2ddc6115b4a977bc',
-      'src/third_party/pyelftools':
-        (Var("git.chromium.org")) + '/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e',
-      'src/third_party/chromite':
-        (Var("git.chromium.org")) + '/chromiumos/chromite.git@8e92d5c24da7967e27ab2498abc2d2f7ac6ec65a',
-      'build/third_party/xvfb':
-        '/trunk/tools/third_party/xvfb@125214',
-      'src/third_party/xdg-utils':
-        (Var("git.chromium.org")) + '/chromium/deps/xdg-utils.git@d80274d5869b17b8c9067a1022e4416ee7ed5e0d',
-      'src/third_party/undoview':
-        (Var("git.chromium.org")) + '/chromium/deps/undoview.git@3ba503e248f3cdbd81b78325a24ece0984637559',
-      'src/chrome/tools/test/reference_build/chrome_linux':
-        (Var("git.chromium.org")) + '/chromium/reference_builds/chrome_linux64.git@033d053a528e820e1de3e2db766678d862a86b36',
-      'src/third_party/swig/linux':
-        (Var("git.chromium.org")) + '/chromium/deps/swig/linux.git@866b8e0e0e0cfe99ebe608260030916ca0c3f92d',
-      'src/third_party/liblouis/src':
-        (Var("git.chromium.org")) + '/external/liblouis-github.git@5f9c03f2a3478561deb6ae4798175094be8a26c2',
-      'src/third_party/freetype2/src':
-        (Var("git.chromium.org")) + '/chromium/src/third_party/freetype2.git@d699c2994ecc178c4ed05ac2086061b2034c2178',
-      'src/third_party/lss':
-        (Var("git.chromium.org")) + '/external/linux-syscall-support/lss.git@952107fa7cea0daaabead28c0e92d579bee517eb'
-    },
-    'android': {
-      'src/third_party/android_webview_glue/src':
-        (Var("git.chromium.org")) + '/external/android_webview_glue.git@a1b0248c80f239e2f6476b9f395b27d0ba1eb3cd',
-      'src/third_party/jarjar':
-        (Var("git.chromium.org")) + '/chromium/deps/jarjar.git@2e1ead4c68c450e0b77fe49e3f9137842b8b6920',
-      'src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille':
-        (Var("git.chromium.org")) + '/external/eyes-free/braille/client/src/com/googlecode/eyesfree/braille.git@77bf6edb0138e3a38a2772248696f130dab45e34',
-      'src/third_party/freetype':
-        (Var("git.chromium.org")) + '/chromium/src/third_party/freetype.git@a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
-      'src/third_party/apache-mime4j':
-        (Var("git.chromium.org")) + '/chromium/deps/apache-mime4j.git@28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
-      'src/third_party/elfutils/src':
-        (Var("git.chromium.org")) + '/external/elfutils.git@249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
-      'src/pdf': None,
-      'src/third_party/junit/src':
-        (Var("git.chromium.org")) + '/external/junit.git@c62e2df8dbecccb1b434d4ba8843b59e90b03266',
-      'src/third_party/android_tools':
-        (Var("git.chromium.org")) + '/android_tools.git@d2b86205ff973a3844020feacb35ca6b1d82efbe',
-      'src/third_party/httpcomponents-client':
-        (Var("git.chromium.org")) + '/chromium/deps/httpcomponents-client.git@285c4dafc5de0e853fa845dce5773e223219601c',
-      'src/third_party/findbugs':
-        (Var("git.chromium.org")) + '/chromium/deps/findbugs.git@7f69fa78a6db6dc31866d09572a0e356e921bf12',
-      'src/third_party/lss':
-        (Var("git.chromium.org")) + '/external/linux-syscall-support/lss.git@952107fa7cea0daaabead28c0e92d579bee517eb',
-      'src/third_party/android_protobuf/src':
-        (Var("git.chromium.org")) + '/external/android_protobuf.git@94f522f907e3f34f70d9e7816b947e62fddbb267',
-      'src/third_party/jsr-305/src':
-        (Var("git.chromium.org")) + '/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919',
-      'src/third_party/httpcomponents-core':
-        (Var("git.chromium.org")) + '/chromium/deps/httpcomponents-core.git@9f7180a96f8fa5cab23f793c14b413356d419e62'
-    }
+    'src/third_party/nss':
+      (Var("git.chromium.org")) + '/chromium/deps/nss.git@87b96db4268293187d7cf741907a6d5d1d8080e0'
+  },
+  'unix': {
+    'src/third_party/fontconfig/src':
+      (Var("git.chromium.org")) + '/external/fontconfig.git@f16c3118e25546c1b749f9823c51827a60aeb5c1',
+    'src/third_party/freetype2/src':
+      (Var("git.chromium.org")) + '/chromium/src/third_party/freetype2.git@d699c2994ecc178c4ed05ac2086061b2034c2178',
+    'src/third_party/pyelftools':
+      (Var("git.chromium.org")) + '/chromiumos/third_party/pyelftools.git@bdc1d380acd88d4bfaf47265008091483b0d614e',
+    'src/third_party/chromite':
+      (Var("git.chromium.org")) + '/chromiumos/chromite.git@8e92d5c24da7967e27ab2498abc2d2f7ac6ec65a',
+    'build/third_party/xvfb':
+      '/trunk/tools/third_party/xvfb@125214',
+    'src/third_party/xdg-utils':
+      (Var("git.chromium.org")) + '/chromium/deps/xdg-utils.git@d80274d5869b17b8c9067a1022e4416ee7ed5e0d',
+    'src/third_party/undoview':
+      (Var("git.chromium.org")) + '/chromium/deps/undoview.git@3ba503e248f3cdbd81b78325a24ece0984637559',
+    'src/third_party/cros_system_api':
+      (Var("git.chromium.org")) + '/chromiumos/platform/system_api.git@f0fc55329fa536195861778a2ddc6115b4a977bc',
+    'src/chrome/tools/test/reference_build/chrome_linux':
+      (Var("git.chromium.org")) + '/chromium/reference_builds/chrome_linux64.git@033d053a528e820e1de3e2db766678d862a86b36',
+    'src/third_party/swig/linux':
+      (Var("git.chromium.org")) + '/chromium/deps/swig/linux.git@866b8e0e0e0cfe99ebe608260030916ca0c3f92d',
+    'src/third_party/liblouis/src':
+      (Var("git.chromium.org")) + '/external/liblouis-github.git@5f9c03f2a3478561deb6ae4798175094be8a26c2',
+    'build/third_party/cbuildbot_chromite':
+      (Var("git.chromium.org")) + '/chromiumos/chromite.git@1e95b44e033daa6b48e2e9702c5b08a9410f11d8',
+    'src/third_party/lss':
+      (Var("git.chromium.org")) + '/external/linux-syscall-support/lss.git@952107fa7cea0daaabead28c0e92d579bee517eb'
+  },
+  'android': {
+    'src/third_party/android_webview_glue/src':
+      (Var("git.chromium.org")) + '/external/android_webview_glue.git@a1b0248c80f239e2f6476b9f395b27d0ba1eb3cd',
+    'src/third_party/jarjar':
+      (Var("git.chromium.org")) + '/chromium/deps/jarjar.git@2e1ead4c68c450e0b77fe49e3f9137842b8b6920',
+    'src/third_party/android_tools':
+      (Var("git.chromium.org")) + '/android_tools.git@d2b86205ff973a3844020feacb35ca6b1d82efbe',
+    'src/pdf': None,
+    'src/third_party/apache-mime4j':
+      (Var("git.chromium.org")) + '/chromium/deps/apache-mime4j.git@28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
+    'src/third_party/elfutils/src':
+      (Var("git.chromium.org")) + '/external/elfutils.git@249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
+    'src/third_party/freetype':
+      (Var("git.chromium.org")) + '/chromium/src/third_party/freetype.git@a2b9955b49034a51dfbc8bf9f4e9d312149cecac',
+    'src/third_party/junit/src':
+      (Var("git.chromium.org")) + '/external/junit.git@c62e2df8dbecccb1b434d4ba8843b59e90b03266',
+    'src/third_party/eyesfree/src/android/java/src/com/googlecode/eyesfree/braille':
+      (Var("git.chromium.org")) + '/external/eyes-free/braille/client/src/com/googlecode/eyesfree/braille.git@77bf6edb0138e3a38a2772248696f130dab45e34',
+    'src/third_party/httpcomponents-client':
+      (Var("git.chromium.org")) + '/chromium/deps/httpcomponents-client.git@285c4dafc5de0e853fa845dce5773e223219601c',
+    'src/third_party/findbugs':
+      (Var("git.chromium.org")) + '/chromium/deps/findbugs.git@7f69fa78a6db6dc31866d09572a0e356e921bf12',
+    'src/third_party/lss':
+      (Var("git.chromium.org")) + '/external/linux-syscall-support/lss.git@952107fa7cea0daaabead28c0e92d579bee517eb',
+    'src/third_party/android_protobuf/src':
+      (Var("git.chromium.org")) + '/external/android_protobuf.git@94f522f907e3f34f70d9e7816b947e62fddbb267',
+    'src/third_party/jsr-305/src':
+      (Var("git.chromium.org")) + '/external/jsr-305.git@642c508235471f7220af6d5df2d3210e3bfc0919',
+    'src/third_party/httpcomponents-core':
+      (Var("git.chromium.org")) + '/chromium/deps/httpcomponents-core.git@9f7180a96f8fa5cab23f793c14b413356d419e62'
   }
+}
 
 deps = {
   'depot_tools':
@@ -262,8 +262,6 @@
     (Var("git.chromium.org")) + '/external/bidichecker/lib.git@97f2aa645b74c28c57eca56992235c79850fa9e0',
   'src/third_party/libc++/trunk':
     (Var("git.chromium.org")) + '/chromium/llvm-project/libcxx.git@48198f9110397fff47fe7c37cbfa296be7d44d3d',
-  'src/third_party/colorama/src':
-    (Var("git.chromium.org")) + '/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
   'src/third_party/libwebm/source':
     (Var("git.chromium.org")) + '/webm/libwebm.git@0d4cb404ea4195e5e21d04db2c955615535ce62e',
   'src/third_party/usrsctp/usrsctplib':
@@ -374,20 +372,22 @@
     (Var("git.chromium.org")) + '/chromium/deps/icu52.git@d2abf6c1e1f986f4a8db0341b8a8c55c55ec1174',
   'src/third_party/opus/src':
     (Var("git.chromium.org")) + '/chromium/deps/opus.git@cae696156f1e60006e39821e79a1811ae1933c69',
-  'src/tools/grit':
-    (Var("git.chromium.org")) + '/external/grit-i18n.git@740badd5e3e44434a9a47b5d16749daac1e8ea80',
+  'src/third_party/colorama/src':
+    (Var("git.chromium.org")) + '/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8',
   'src/third_party/snappy/src':
     (Var("git.chromium.org")) + '/external/snappy.git@762bb32f0c9d2f31ba4958c7c0933d22e80c20bf',
   'src/third_party/webpagereplay':
     (Var("git.chromium.org")) + '/external/web-page-replay.git@2f7b704b8b567983c040f555d3e46f9766db8e87',
   'src/third_party/WebKit':
-    (Var("git.chromium.org")) + '/chromium/blink.git@46701e45dce4e844a0a1d14d69a91a509587aba1',
+    (Var("git.chromium.org")) + '/chromium/blink.git@84bb8e73ca39609b5f5a4a5c7e1263619f4f9bdd',
   'src/breakpad/src':
     (Var("git.chromium.org")) + '/external/google-breakpad/src.git@35189355da4b65ed5e7692f790c240a9ab347731',
   'src/third_party/hunspell':
     (Var("git.chromium.org")) + '/chromium/deps/hunspell.git@c956c0e97af00ef789afb2f64d02c9a5a50e6eb1',
   'src/tools/deps2git':
     (Var("git.chromium.org")) + '/chromium/tools/deps2git.git@f04828eb0b5acd3e7ad983c024870f17f17b06d9',
+  'src/tools/grit':
+    (Var("git.chromium.org")) + '/external/grit-i18n.git@740badd5e3e44434a9a47b5d16749daac1e8ea80',
   'src/third_party/libjpeg_turbo':
     (Var("git.chromium.org")) + '/chromium/deps/libjpeg_turbo.git@034e9a9747e0983bc19808ea70e469bc8342081f',
   'src/testing/gtest':
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/.DEPS.git oxide-qt-1.3.5/third_party/chromium/src/.DEPS.git
--- oxide-qt-1.3.4/third_party/chromium/src/.DEPS.git	2014-11-13 00:50:28.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/.DEPS.git	2014-11-18 17:01:38.000000000 +0000
@@ -7,7 +7,7 @@
     'eyes-free':
          'http://eyes-free.googlecode.com/svn',
     'webkit_rev':
-         '@46701e45dce4e844a0a1d14d69a91a509587aba1',
+         '@84bb8e73ca39609b5f5a4a5c7e1263619f4f9bdd',
     'blink':
          'http://src.chromium.org/blink',
     'skia':
Binary files /tmp/VP6xZO1h3h/oxide-qt-1.3.4/third_party/chromium/src/.git/index and /tmp/Uq5Z2yzzRp/oxide-qt-1.3.5/third_party/chromium/src/.git/index differ
Binary files /tmp/VP6xZO1h3h/oxide-qt-1.3.4/third_party/chromium/src/third_party/icu/.git/index and /tmp/Uq5Z2yzzRp/oxide-qt-1.3.5/third_party/chromium/src/third_party/icu/.git/index differ
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/BUILD.gn oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/BUILD.gn
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/BUILD.gn	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/BUILD.gn	2014-11-18 17:01:38.000000000 +0000
@@ -548,7 +548,6 @@
     deps = [
       ":libjingle_webrtc_common",
       "//third_party/webrtc",
-      "//third_party/webrtc/modules/audio_processing",
       "//third_party/webrtc/system_wrappers",
       "//third_party/webrtc/voice_engine",
     ]
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/libjingle.gyp oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/libjingle.gyp
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/libjingle.gyp	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/libjingle.gyp	2014-11-18 17:01:38.000000000 +0000
@@ -589,7 +589,6 @@
             '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
           ],
           'dependencies': [
-            '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
             '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
             '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/initialize_module.cc oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/initialize_module.cc
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/initialize_module.cc	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/initialize_module.cc	2014-11-18 17:01:38.000000000 +0000
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "init_webrtc.h"
 #include "talk/media/webrtc/webrtcmediaengine.h"
-#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/logging.h"
 
@@ -72,9 +71,7 @@
                       CreateWebRtcMediaEngineFunction* create_media_engine,
                       DestroyWebRtcMediaEngineFunction* destroy_media_engine,
                       InitDiagnosticLoggingDelegateFunctionFunction*
-                          init_diagnostic_logging,
-                      CreateWebRtcAudioProcessingFunction*
-                          create_audio_processing) {
+                          init_diagnostic_logging) {
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
   g_alloc = alloc;
   g_dealloc = dealloc;
@@ -85,7 +82,6 @@
   *create_media_engine = &CreateWebRtcMediaEngine;
   *destroy_media_engine = &DestroyWebRtcMediaEngine;
   *init_diagnostic_logging = &rtc::InitDiagnosticLoggingDelegateFunction;
-  *create_audio_processing = &webrtc::AudioProcessing::Create;
 
   if (CommandLine::Init(0, NULL)) {
 #if !defined(OS_WIN)
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.cc oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.cc
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.cc	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.cc	2014-11-18 17:01:38.000000000 +0000
@@ -11,8 +11,6 @@
 #include "base/metrics/field_trial.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
-#include "third_party/webrtc/common.h"
-#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/logging.h"
 
@@ -55,13 +53,6 @@
   return true;
 }
 
-webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
-    const webrtc::Config& config) {
-  // libpeerconnection is being compiled as a static lib, use
-  // webrtc::AudioProcessing directly.
-  return webrtc::AudioProcessing::Create(config);
-}
-
 #else  // !LIBPEERCONNECTION_LIB
 
 // When being compiled as a shared library, we need to bridge the gap between
@@ -71,7 +62,6 @@
 // Global function pointers to the factory functions in the shared library.
 CreateWebRtcMediaEngineFunction g_create_webrtc_media_engine = NULL;
 DestroyWebRtcMediaEngineFunction g_destroy_webrtc_media_engine = NULL;
-CreateWebRtcAudioProcessingFunction g_create_webrtc_audio_processing = NULL;
 
 // Returns the full or relative path to the libpeerconnection module depending
 // on what platform we're on.
@@ -145,8 +135,8 @@
                                    &AddTraceEvent,
                                    &g_create_webrtc_media_engine,
                                    &g_destroy_webrtc_media_engine,
-                                   &init_diagnostic_logging,
-                                   &g_create_webrtc_audio_processing);
+                                   &init_diagnostic_logging);
+
   if (init_ok)
     rtc::SetExtraLoggingInit(init_diagnostic_logging);
   return init_ok;
@@ -170,12 +160,4 @@
   g_destroy_webrtc_media_engine(media_engine);
 }
 
-webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
-    const webrtc::Config& config) {
-  // The same as CreateWebRtcMediaEngine(), we call InitializeWebRtcModule here
-  // for convenience of tests.
-  InitializeWebRtcModule();
-  return g_create_webrtc_audio_processing(config);
-}
-
 #endif  // LIBPEERCONNECTION_LIB
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.h oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.h
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.h	2014-11-03 11:28:08.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/libjingle/overrides/init_webrtc.h	2014-11-18 17:01:38.000000000 +0000
@@ -23,8 +23,6 @@
 
 namespace webrtc {
 class AudioDeviceModule;
-class AudioProcessing;
-class Config;
 }  // namespace webrtc
 
 typedef std::string (*FieldTrialFindFullName)(const std::string& trial_name);
@@ -41,9 +39,6 @@
 typedef void (*InitDiagnosticLoggingDelegateFunctionFunction)(
     void (*DelegateFunction)(const std::string&));
 
-typedef webrtc::AudioProcessing* (*CreateWebRtcAudioProcessingFunction)(
-    const webrtc::Config& config);
-
 // A typedef for the main initialize function in libpeerconnection.
 // This will initialize logging in the module with the proper arguments
 // as well as provide pointers back to a couple webrtc factory functions.
@@ -61,8 +56,7 @@
     webrtc::AddTraceEventPtr trace_add_trace_event,
     CreateWebRtcMediaEngineFunction* create_media_engine,
     DestroyWebRtcMediaEngineFunction* destroy_media_engine,
-    InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging,
-    CreateWebRtcAudioProcessingFunction* create_audio_processing);
+    InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging);
 
 #if !defined(LIBPEERCONNECTION_IMPLEMENTATION)
 // Load and initialize the shared WebRTC module (libpeerconnection).
@@ -71,11 +65,6 @@
 // If not called explicitly, this function will still be called from the main
 // CreateWebRtcMediaEngine factory function the first time it is called.
 bool InitializeWebRtcModule();
-
-// Return a webrtc::AudioProcessing object.
-webrtc::AudioProcessing* CreateWebRtcAudioProcessing(
-    const webrtc::Config& config);
-
 #endif
 
 #endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_INIT_WEBRTC_H_
Binary files /tmp/VP6xZO1h3h/oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/.git/index and /tmp/Uq5Z2yzzRp/oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/.git/index differ
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.cpp oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.cpp
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.cpp	2014-11-06 20:17:27.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.cpp	2014-11-18 17:01:45.000000000 +0000
@@ -3894,13 +3894,6 @@
     ensureScriptedAnimationController().enqueueMediaQueryChangeListeners(listeners);
 }
 
-void Document::dispatchEventsForPrinting()
-{
-    if (!m_scriptedAnimationController)
-        return;
-    m_scriptedAnimationController->dispatchEventsAndCallbacksForPrinting();
-}
-
 Document::EventFactorySet& Document::eventFactories()
 {
     DEFINE_STATIC_LOCAL(EventFactorySet, s_eventFactory, ());
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.h oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.h
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.h	2014-11-06 20:17:27.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/Document.h	2014-11-18 17:01:45.000000000 +0000
@@ -917,8 +917,6 @@
     void enqueueUniqueAnimationFrameEvent(PassRefPtrWillBeRawPtr<Event>);
     void enqueueMediaQueryChangeListeners(WillBeHeapVector<RefPtrWillBeMember<MediaQueryListListener> >&);
 
-    void dispatchEventsForPrinting();
-
     bool hasFullscreenSupplement() const { return m_hasFullscreenSupplement; }
     void setHasFullscreenSupplement() { m_hasFullscreenSupplement = true; }
 
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp	2014-11-06 20:17:27.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.cpp	2014-11-18 17:01:45.000000000 +0000
@@ -81,12 +81,6 @@
     scheduleAnimationIfNeeded();
 }
 
-void ScriptedAnimationController::dispatchEventsAndCallbacksForPrinting()
-{
-    dispatchEvents();
-    callMediaQueryListListeners();
-}
-
 ScriptedAnimationController::CallbackId ScriptedAnimationController::registerCallback(RequestAnimationFrameCallback* callback)
 {
     ScriptedAnimationController::CallbackId id = ++m_nextCallbackId;
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h	2014-11-06 20:17:27.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/core/dom/ScriptedAnimationController.h	2014-11-18 17:01:45.000000000 +0000
@@ -64,7 +64,6 @@
     void suspend();
     void resume();
 
-    void dispatchEventsAndCallbacksForPrinting();
 private:
     explicit ScriptedAnimationController(Document*);
 
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.cpp oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.cpp
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.cpp	2014-10-09 22:18:44.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.cpp	2014-11-18 17:01:45.000000000 +0000
@@ -39,7 +39,6 @@
 #include "core/rendering/compositing/CompositedLayerMapping.h"
 #include "core/rendering/style/ShadowData.h"
 #include "platform/graphics/Color.h"
-#include "platform/graphics/DisplayList.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebCompositorAnimationCurve.h"
 #include "public/platform/WebCompositorSupport.h"
@@ -237,13 +236,6 @@
     bool pathHasChanged = !(newPath == m_path);
     if (pathHasChanged) {
         m_path = newPath;
-
-        GraphicsContext gc(0);
-        gc.beginRecording(boundingRect);
-        gc.setFillColor(m_node->renderer()->style()->tapHighlightColor());
-        gc.fillPath(m_path);
-        m_displayList = gc.endRecording();
-
         m_contentLayer->layer()->setBounds(enclosingIntRect(boundingRect).size());
     }
 
@@ -260,8 +252,9 @@
     GraphicsContext gc(canvas,
         contextStatus == WebContentLayerClient::GraphicsContextEnabled ? GraphicsContext::NothingDisabled : GraphicsContext::FullyDisabled);
     IntRect clipRect(IntPoint(webClipRect.x, webClipRect.y), IntSize(webClipRect.width, webClipRect.height));
-    m_displayList->setClip(clipRect);
-    gc.drawDisplayList(m_displayList.get());
+    gc.clip(clipRect);
+    gc.setFillColor(m_node->renderer()->style()->tapHighlightColor());
+    gc.fillPath(m_path);
 }
 
 void LinkHighlight::startHighlightAnimationIfNeeded()
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.h oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.h
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.h	2014-10-09 22:18:44.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/LinkHighlight.h	2014-11-18 17:01:45.000000000 +0000
@@ -39,7 +39,6 @@
 
 namespace blink {
 
-class DisplayList;
 class Node;
 class RenderLayer;
 class RenderObject;
@@ -86,7 +85,6 @@
     OwnPtr<WebContentLayer> m_contentLayer;
     OwnPtr<WebLayer> m_clipLayer;
     Path m_path;
-    RefPtr<DisplayList> m_displayList;
 
     RefPtrWillBePersistent<Node> m_node;
     WebViewImpl* m_owningWebViewImpl;
diff -Nru oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp
--- oxide-qt-1.3.4/third_party/chromium/src/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp	2014-11-06 20:17:27.000000000 +0000
+++ oxide-qt-1.3.5/third_party/chromium/src/third_party/WebKit/Source/web/WebLocalFrameImpl.cpp	2014-11-18 17:01:45.000000000 +0000
@@ -323,26 +323,18 @@
 
     float spoolSinglePage(GraphicsContext& graphicsContext, int pageNumber)
     {
-        frame()->document()->dispatchEventsForPrinting();
-        if (!frame()->document() || !frame()->document()->renderView())
-            return 0;
-
+        // FIXME: Why is it ok to proceed without all the null checks that
+        // spoolAllPagesWithBoundaries does?
         frame()->view()->updateLayoutAndStyleForPainting();
-        if (!frame()->document() || !frame()->document()->renderView())
-            return 0;
-
         return spoolPage(graphicsContext, pageNumber);
     }
 
     void spoolAllPagesWithBoundaries(GraphicsContext& graphicsContext, const FloatSize& pageSizeInPixels)
     {
-        frame()->document()->dispatchEventsForPrinting();
-        if (!frame()->document() || !frame()->document()->renderView())
+        if (!frame()->document() || !frame()->view() || !frame()->document()->renderView())
             return;
 
         frame()->view()->updateLayoutAndStyleForPainting();
-        if (!frame()->document() || !frame()->document()->renderView())
-            return;
 
         float pageHeight;
         computePageRects(FloatRect(FloatPoint(0, 0), pageSizeInPixels), 0, 0, 1, pageHeight);
Binary files /tmp/VP6xZO1h3h/oxide-qt-1.3.4/third_party/chromium/src/tools/gyp/.git/index and /tmp/Uq5Z2yzzRp/oxide-qt-1.3.5/third_party/chromium/src/tools/gyp/.git/index differ