Merge lp:~osomon/oxide/text-selection-colors into lp:~oxide-developers/oxide/oxide.trunk

[Olivier Tilloy]

Expose the text selection colors (active/inactive background/foreground) to the embedder, through the WebContext.

[lp:~osomon/oxide/text-selection-colors]

1282. By Olivier Tilloy on 2016-02-08

Merge the latest changes from trunk and resolve a few conflicts.

1283. By Olivier Tilloy on 2016-02-08

Bump version to 1.14 and re-generate qmltypes file.

[Olivier Tilloy (osomon)]

Superseded by https://code.launchpad.net/~osomon/oxide/hardcoded-selection-colors/+merge/287015.

review: Disapprove

Unmerged revisions

1283. By Olivier Tilloy on 2016-02-08

Bump version to 1.14 and re-generate qmltypes file.

1282. By Olivier Tilloy on 2016-02-08

Merge the latest changes from trunk and resolve a few conflicts.

1281. By Olivier Tilloy on 2015-11-20

Add unit tests for the selection colors.

1280. By Olivier Tilloy on 2015-11-20

Bump version to 1.12.

1279. By Olivier Tilloy on 2015-11-20

Expose the text selection colors (active/inactive background/foreground) to the embedder, through the WebContext.

=== modified file 'qt/core/browser/oxide_qt_web_context.cc'
--- qt/core/browser/oxide_qt_web_context.cc	2016-01-13 18:16:11 +0000
+++ qt/core/browser/oxide_qt_web_context.cc	2016-02-08 18:10:28 +0000
@@ -43,6 +43,7 @@
 #include "net/cookies/cookie_monster.h"
 #include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "url/gurl.h"
 
 #include "qt/core/api/oxideqnetworkcallbackevents_p.h"
@@ -140,7 +141,11 @@
         devtools_enabled(false),
         devtools_port(-1),
         legacy_user_agent_override_enabled(false),
-        do_not_track(false) {}
+        do_not_track(false),
+        active_selection_bg_color(SK_ColorTRANSPARENT),
+        active_selection_fg_color(SK_ColorTRANSPARENT),
+        inactive_selection_bg_color(SK_ColorTRANSPARENT),
+        inactive_selection_fg_color(SK_ColorTRANSPARENT) {}
 
   std::string product;
   std::string user_agent;
@@ -160,6 +165,10 @@
   std::vector<UserAgentSettings::UserAgentOverride> user_agent_overrides;
   bool legacy_user_agent_override_enabled;
   bool do_not_track;
+  SkColor active_selection_bg_color;
+  SkColor active_selection_fg_color;
+  SkColor inactive_selection_bg_color;
+  SkColor inactive_selection_fg_color;
 };
 
 class SetCookiesContext : public base::RefCounted<SetCookiesContext> {
@@ -532,6 +541,23 @@
   context_->SetIsPopupBlockerEnabled(construct_props_->popup_blocker_enabled);
   context_->SetDoNotTrack(construct_props_->do_not_track);
 
+  if (construct_props_->active_selection_bg_color != SK_ColorTRANSPARENT) {
+    context_->SetActiveSelectionBgColor(
+        construct_props_->active_selection_bg_color);
+  }
+  if (construct_props_->active_selection_fg_color != SK_ColorTRANSPARENT) {
+    context_->SetActiveSelectionFgColor(
+        construct_props_->active_selection_fg_color);
+  }
+  if (construct_props_->inactive_selection_bg_color != SK_ColorTRANSPARENT) {
+    context_->SetInactiveSelectionBgColor(
+        construct_props_->inactive_selection_bg_color);
+  }
+  if (construct_props_->inactive_selection_fg_color != SK_ColorTRANSPARENT) {
+    context_->SetInactiveSelectionFgColor(
+        construct_props_->inactive_selection_fg_color);
+  }
+
   MediaCaptureDevicesContext* dc =
       MediaCaptureDevicesContext::Get(context_.get());
 
@@ -1058,7 +1084,7 @@
 }
 
 bool WebContext::doNotTrack() const {
-    if (IsInitialized()) {
+  if (IsInitialized()) {
     return context_->GetDoNotTrack();
   }
 
@@ -1073,5 +1099,89 @@
   }
 }
 
+QColor WebContext::activeSelectionBgColor() const {
+  SkColor skcolor;
+  if (IsInitialized()) {
+    skcolor = context_->GetActiveSelectionBgColor();
+  } else {
+    skcolor = construct_props_->active_selection_bg_color;
+  }
+  return QColor(SkColorGetR(skcolor), SkColorGetG(skcolor),
+                SkColorGetB(skcolor), SkColorGetA(skcolor));
+}
+
+void WebContext::setActiveSelectionBgColor(const QColor& color) {
+  SkColor skcolor(
+      SkColorSetARGB(color.alpha(), color.red(), color.green(), color.blue()));
+  if (IsInitialized()) {
+    context_->SetActiveSelectionBgColor(skcolor);
+  } else {
+    construct_props_->active_selection_bg_color = skcolor;
+  }
+}
+
+QColor WebContext::activeSelectionFgColor() const {
+  SkColor skcolor;
+  if (IsInitialized()) {
+    skcolor = context_->GetActiveSelectionFgColor();
+  } else {
+    skcolor = construct_props_->active_selection_fg_color;
+  }
+  return QColor(SkColorGetR(skcolor), SkColorGetG(skcolor),
+                SkColorGetB(skcolor), SkColorGetA(skcolor));
+}
+
+void WebContext::setActiveSelectionFgColor(const QColor& color) {
+  SkColor skcolor(
+      SkColorSetARGB(color.alpha(), color.red(), color.green(), color.blue()));
+  if (IsInitialized()) {
+    context_->SetActiveSelectionFgColor(skcolor);
+  } else {
+    construct_props_->active_selection_fg_color = skcolor;
+  }
+}
+
+QColor WebContext::inactiveSelectionBgColor() const {
+  SkColor skcolor;
+  if (IsInitialized()) {
+    skcolor = context_->GetInactiveSelectionBgColor();
+  } else {
+    skcolor = construct_props_->inactive_selection_bg_color;
+  }
+  return QColor(SkColorGetR(skcolor), SkColorGetG(skcolor),
+                SkColorGetB(skcolor), SkColorGetA(skcolor));
+}
+
+void WebContext::setInactiveSelectionBgColor(const QColor& color) {
+  SkColor skcolor(
+      SkColorSetARGB(color.alpha(), color.red(), color.green(), color.blue()));
+  if (IsInitialized()) {
+    context_->SetInactiveSelectionBgColor(skcolor);
+  } else {
+    construct_props_->inactive_selection_bg_color = skcolor;
+  }
+}
+
+QColor WebContext::inactiveSelectionFgColor() const {
+  SkColor skcolor;
+  if (IsInitialized()) {
+    skcolor = context_->GetInactiveSelectionFgColor();
+  } else {
+    skcolor = construct_props_->inactive_selection_fg_color;
+  }
+  return QColor(SkColorGetR(skcolor), SkColorGetG(skcolor),
+                SkColorGetB(skcolor), SkColorGetA(skcolor));
+}
+
+void WebContext::setInactiveSelectionFgColor(const QColor& color) {
+  SkColor skcolor(
+      SkColorSetARGB(color.alpha(), color.red(), color.green(), color.blue()));
+  if (IsInitialized()) {
+    context_->SetInactiveSelectionFgColor(skcolor);
+  } else {
+    construct_props_->inactive_selection_fg_color = skcolor;
+  }
+}
+
 } // namespace qt
 } // namespace oxide

=== modified file 'qt/core/browser/oxide_qt_web_context.h'
--- qt/core/browser/oxide_qt_web_context.h	2016-01-04 13:40:25 +0000
+++ qt/core/browser/oxide_qt_web_context.h	2016-02-08 18:10:28 +0000
@@ -146,9 +146,16 @@
       const QList<UserAgentOverride>& overrides) override;
   void clearTemporarySavedPermissionStatuses() override;
   void setLegacyUserAgentOverrideEnabled(bool enabled) override;
-
   bool doNotTrack() const override;
   void setDoNotTrack(bool dnt) override;
+  QColor activeSelectionBgColor() const override;
+  void setActiveSelectionBgColor(const QColor& color) override;
+  QColor activeSelectionFgColor() const override;
+  void setActiveSelectionFgColor(const QColor& color) override;
+  QColor inactiveSelectionBgColor() const override;
+  void setInactiveSelectionBgColor(const QColor& color) override;
+  QColor inactiveSelectionFgColor() const override;
+  void setInactiveSelectionFgColor(const QColor& color) override;
 
   // oxide::MediaCaptureDevicesContextClient implementation
   void DefaultAudioDeviceChanged() override;

=== modified file 'qt/core/glue/oxide_qt_web_context_proxy.h'
--- qt/core/glue/oxide_qt_web_context_proxy.h	2015-07-03 14:22:25 +0000
+++ qt/core/glue/oxide_qt_web_context_proxy.h	2016-02-08 18:10:28 +0000
@@ -18,6 +18,7 @@
 #ifndef _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_PROXY_H_
 #define _OXIDE_QT_CORE_GLUE_WEB_CONTEXT_PROXY_H_
 
+#include <QColor>
 #include <QPair>
 #include <QString>
 #include <QStringList>
@@ -141,6 +142,18 @@
 
   virtual bool doNotTrack() const = 0;
   virtual void setDoNotTrack(bool dnt) = 0;
+
+  virtual QColor activeSelectionBgColor() const = 0;
+  virtual void setActiveSelectionBgColor(const QColor& color) = 0;
+
+  virtual QColor activeSelectionFgColor() const = 0;
+  virtual void setActiveSelectionFgColor(const QColor& color) = 0;
+
+  virtual QColor inactiveSelectionBgColor() const = 0;
+  virtual void setInactiveSelectionBgColor(const QColor& color) = 0;
+
+  virtual QColor inactiveSelectionFgColor() const = 0;
+  virtual void setInactiveSelectionFgColor(const QColor& color) = 0;
 };
 
 } // namespace qt

=== modified file 'qt/qmlplugin/oxide.qmltypes'
--- qt/qmlplugin/oxide.qmltypes	2016-01-12 11:45:54 +0000
+++ qt/qmlplugin/oxide.qmltypes	2016-02-08 18:10:28 +0000
@@ -4,7 +4,7 @@
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.12 com/canonical/Oxide'
+// 'qmlplugindump -v -noinstantiate com.canonical.Oxide 1.14 com/canonical/Oxide'
 
 Module {
     Component {
@@ -54,11 +54,10 @@
     }
     Component {
         name: "OxideQGeolocationPermissionRequest"
-        prototype: "OxideQSimplePermissionRequest"
+        prototype: "OxideQPermissionRequest"
         exports: ["GeolocationPermissionRequest 1.0"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
-        Property { name: "origin"; type: "QUrl"; isReadonly: true }
         Method { name: "accept" }
     }
     Component {
@@ -78,6 +77,15 @@
         Method { name: "deny" }
     }
     Component {
+        name: "OxideQMediaAccessPermissionRequest"
+        prototype: "OxideQPermissionRequest"
+        exports: ["MediaAccessPermissionRequest 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
+        Property { name: "isForAudio"; type: "bool"; isReadonly: true }
+        Property { name: "isForVideo"; type: "bool"; isReadonly: true }
+    }
+    Component {
         name: "OxideQNavigationRequest"
         prototype: "QObject"
         exports: ["NavigationRequest 1.0"]
@@ -127,11 +135,16 @@
     Component {
         name: "OxideQPermissionRequest"
         prototype: "QObject"
+        exports: ["PermissionRequest 1.0"]
+        isCreatable: false
+        exportMetaObjectRevisions: [0]
         Property { name: "origin"; type: "QUrl"; isReadonly: true }
         Property { name: "embedder"; type: "QUrl"; isReadonly: true }
         Property { name: "isCancelled"; type: "bool"; isReadonly: true }
         Property { name: "url"; type: "QUrl"; isReadonly: true }
         Signal { name: "cancelled" }
+        Method { name: "allow" }
+        Method { name: "deny" }
     }
     Component {
         name: "OxideQQuickCookieManager"
@@ -327,11 +340,12 @@
         prototype: "QObject"
         exports: [
             "WebContext 1.0",
+            "WebContext 1.14",
             "WebContext 1.3",
             "WebContext 1.6",
             "WebContext 1.9"
         ]
-        exportMetaObjectRevisions: [0, 1, 2, 3]
+        exportMetaObjectRevisions: [0, 4, 1, 2, 3]
         Enum {
             name: "CookiePolicy"
             values: {
@@ -388,6 +402,10 @@
         Property { name: "defaultVideoCaptureDeviceId"; revision: 3; type: "string" }
         Property { name: "userAgentOverrides"; revision: 3; type: "QVariantList" }
         Property { name: "doNotTrackEnabled"; revision: 3; type: "bool" }
+        Property { name: "activeSelectionBgColor"; revision: 4; type: "QColor" }
+        Property { name: "activeSelectionFgColor"; revision: 4; type: "QColor" }
+        Property { name: "inactiveSelectionBgColor"; revision: 4; type: "QColor" }
+        Property { name: "inactiveSelectionFgColor"; revision: 4; type: "QColor" }
         Signal { name: "devtoolsBindIpChanged" }
         Signal { name: "hostMappingRulesChanged"; revision: 1 }
         Signal { name: "allowedExtraUrlSchemesChanged"; revision: 1 }
@@ -396,6 +414,10 @@
         Signal { name: "defaultVideoCaptureDeviceIdChanged"; revision: 3 }
         Signal { name: "userAgentOverridesChanged"; revision: 3 }
         Signal { name: "doNotTrackEnabledChanged"; revision: 3 }
+        Signal { name: "activeSelectionBgColorChanged"; revision: 4 }
+        Signal { name: "activeSelectionFgColorChanged"; revision: 4 }
+        Signal { name: "inactiveSelectionBgColorChanged"; revision: 4 }
+        Signal { name: "inactiveSelectionFgColorChanged"; revision: 4 }
         Method {
             name: "addUserScript"
             Parameter { name: "user_script"; type: "OxideQQuickUserScript"; isPointer: true }
@@ -779,7 +801,7 @@
             }
         }
         Enum {
-            name: "ContentStatusFlags"
+            name: "ContentStatus"
             values: {
                 "ContentStatusNormal": 0,
                 "ContentStatusDisplayedInsecure": 1,
@@ -787,7 +809,7 @@
             }
         }
         Enum {
-            name: "CertStatusFlags"
+            name: "CertStatus"
             values: {
                 "CertStatusOk": 0,
                 "CertStatusBadIdentity": 1,
@@ -802,17 +824,11 @@
             }
         }
         Property { name: "securityLevel"; type: "SecurityLevel"; isReadonly: true }
-        Property { name: "contentStatus"; type: "ContentStatusFlags"; isReadonly: true }
-        Property { name: "certStatus"; type: "CertStatusFlags"; isReadonly: true }
+        Property { name: "contentStatus"; type: "ContentStatus"; isReadonly: true }
+        Property { name: "certStatus"; type: "CertStatus"; isReadonly: true }
         Property { name: "certificate"; type: "QVariant"; isReadonly: true }
     }
     Component {
-        name: "OxideQSimplePermissionRequest"
-        prototype: "OxideQPermissionRequest"
-        Method { name: "allow" }
-        Method { name: "deny" }
-    }
-    Component {
         name: "OxideQWebPreferences"
         prototype: "QObject"
         exports: ["WebPreferences 1.0"]

=== modified file 'qt/qmlplugin/oxide_qml_plugin.cc'
--- qt/qmlplugin/oxide_qml_plugin.cc	2016-01-13 19:05:43 +0000
+++ qt/qmlplugin/oxide_qml_plugin.cc	2016-02-08 18:10:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -200,6 +200,8 @@
         "TouchSelectionController is accessed via "
         "WebView.touchSelectionController");
     qmlRegisterType<OxideQQuickWebView, 7>(uri, 1, 12, "WebView");
+
+    qmlRegisterType<OxideQQuickWebContext, 4>(uri, 1, 14, "WebContext");
   }
 };
 

=== modified file 'qt/quick/api/oxideqquickwebcontext.cc'
--- qt/quick/api/oxideqquickwebcontext.cc	2016-01-26 16:47:06 +0000
+++ qt/quick/api/oxideqquickwebcontext.cc	2016-02-08 18:10:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -1155,4 +1155,76 @@
   emit doNotTrackEnabledChanged();
 }
 
+QColor OxideQQuickWebContext::activeSelectionBgColor() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->proxy()->activeSelectionBgColor();
+}
+
+void OxideQQuickWebContext::setActiveSelectionBgColor(const QColor& color) {
+  Q_D(OxideQQuickWebContext);
+
+  if (activeSelectionBgColor() == color) {
+    return;
+  }
+
+  d->proxy()->setActiveSelectionBgColor(color);
+
+  emit activeSelectionBgColorChanged();
+}
+
+QColor OxideQQuickWebContext::activeSelectionFgColor() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->proxy()->activeSelectionFgColor();
+}
+
+void OxideQQuickWebContext::setActiveSelectionFgColor(const QColor& color) {
+  Q_D(OxideQQuickWebContext);
+
+  if (activeSelectionFgColor() == color) {
+    return;
+  }
+
+  d->proxy()->setActiveSelectionFgColor(color);
+
+  emit activeSelectionFgColorChanged();
+}
+
+QColor OxideQQuickWebContext::inactiveSelectionBgColor() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->proxy()->inactiveSelectionBgColor();
+}
+
+void OxideQQuickWebContext::setInactiveSelectionBgColor(const QColor& color) {
+  Q_D(OxideQQuickWebContext);
+
+  if (inactiveSelectionBgColor() == color) {
+    return;
+  }
+
+  d->proxy()->setInactiveSelectionBgColor(color);
+
+  emit inactiveSelectionBgColorChanged();
+}
+
+QColor OxideQQuickWebContext::inactiveSelectionFgColor() const {
+  Q_D(const OxideQQuickWebContext);
+
+  return d->proxy()->inactiveSelectionFgColor();
+}
+
+void OxideQQuickWebContext::setInactiveSelectionFgColor(const QColor& color) {
+  Q_D(OxideQQuickWebContext);
+
+  if (inactiveSelectionFgColor() == color) {
+    return;
+  }
+
+  d->proxy()->setInactiveSelectionFgColor(color);
+
+  emit inactiveSelectionFgColorChanged();
+}
+
 #include "moc_oxideqquickwebcontext.cpp"

=== modified file 'qt/quick/api/oxideqquickwebcontext.h'
--- qt/quick/api/oxideqquickwebcontext.h	2016-01-13 18:16:11 +0000
+++ qt/quick/api/oxideqquickwebcontext.h	2016-02-08 18:10:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013-2015 Canonical Ltd.
+// Copyright (C) 2013-2016 Canonical Ltd.
 
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -24,6 +24,7 @@
 #include <QtCore/QtGlobal>
 #include <QtCore/QUrl>
 #include <QtCore/QVariantList>
+#include <QtGui/QColor>
 #include <QtQml/QQmlListProperty>
 #include <QtQml/QQmlParserStatus>
 #include <QtQml/QtQml>
@@ -77,6 +78,11 @@
 
   Q_PROPERTY(bool doNotTrackEnabled READ doNotTrack WRITE setDoNotTrack NOTIFY doNotTrackEnabledChanged REVISION 3)
 
+  Q_PROPERTY(QColor activeSelectionBgColor READ activeSelectionBgColor WRITE setActiveSelectionBgColor NOTIFY activeSelectionBgColorChanged REVISION 4)
+  Q_PROPERTY(QColor activeSelectionFgColor READ activeSelectionFgColor WRITE setActiveSelectionFgColor NOTIFY activeSelectionFgColorChanged REVISION 4)
+  Q_PROPERTY(QColor inactiveSelectionBgColor READ inactiveSelectionBgColor WRITE setInactiveSelectionBgColor NOTIFY inactiveSelectionBgColorChanged REVISION 4)
+  Q_PROPERTY(QColor inactiveSelectionFgColor READ inactiveSelectionFgColor WRITE setInactiveSelectionFgColor NOTIFY inactiveSelectionFgColorChanged REVISION 4)
+
   Q_ENUMS(CookiePolicy)
   Q_ENUMS(SessionCookieMode)
 
@@ -173,6 +179,18 @@
   bool doNotTrack() const;
   void setDoNotTrack(bool dnt);
 
+  QColor activeSelectionBgColor() const;
+  void setActiveSelectionBgColor(const QColor& color);
+
+  QColor activeSelectionFgColor() const;
+  void setActiveSelectionFgColor(const QColor& color);
+
+  QColor inactiveSelectionBgColor() const;
+  void setInactiveSelectionBgColor(const QColor& color);
+
+  QColor inactiveSelectionFgColor() const;
+  void setInactiveSelectionFgColor(const QColor& color);
+
  Q_SIGNALS:
   void productChanged();
   void userAgentChanged();
@@ -196,6 +214,10 @@
   Q_REVISION(3) void defaultVideoCaptureDeviceIdChanged();
   Q_REVISION(3) void userAgentOverridesChanged();
   Q_REVISION(3) void doNotTrackEnabledChanged();
+  Q_REVISION(4) void activeSelectionBgColorChanged();
+  Q_REVISION(4) void activeSelectionFgColorChanged();
+  Q_REVISION(4) void inactiveSelectionBgColorChanged();
+  Q_REVISION(4) void inactiveSelectionFgColorChanged();
 
  protected:
   // QQmlParserStatus implementation

=== added file 'qt/tests/qmltests/api/tst_WebContext_selectionColors.qml'
--- qt/tests/qmltests/api/tst_WebContext_selectionColors.qml	1970-01-01 00:00:00 +0000
+++ qt/tests/qmltests/api/tst_WebContext_selectionColors.qml	2016-02-08 18:10:28 +0000
@@ -0,0 +1,110 @@
+import QtQuick 2.0
+import QtTest 1.0
+import com.canonical.Oxide 1.12
+import com.canonical.Oxide.Testing 1.0
+
+TestWebView {
+  id: webView
+
+  focus: true
+
+  width: 200
+  height: 200
+
+  SignalSpy {
+    id: activeBgSpy
+    target: webView.context
+    signalName: "activeSelectionBgColorChanged"
+  }
+
+  SignalSpy {
+    id: activeFgSpy
+    target: webView.context
+    signalName: "activeSelectionFgColorChanged"
+  }
+
+  SignalSpy {
+    id: inactiveBgSpy
+    target: webView.context
+    signalName: "inactiveSelectionBgColorChanged"
+  }
+
+  SignalSpy {
+    id: inactiveFgSpy
+    target: webView.context
+    signalName: "inactiveSelectionFgColorChanged"
+  }
+
+  Binding {
+    id: colorBinding
+    target: webView.context
+  }
+
+  TestCase {
+    id: test
+    name: "WebContext_selectionColors"
+    when: windowShown
+
+    // Default values defined in content/public/common/renderer_preferences.cc
+    readonly property color defaultActiveBg: "#1E90FF"
+    readonly property color defaultActiveFg: "white"
+    readonly property color defaultInactiveBg: "#C8C8C8"
+    readonly property color defaultInactiveFg: "#323232"
+
+    // Test colors
+    readonly property color red: "red"
+    readonly property color green: "green"
+
+    function init() {
+      activeBgSpy.clear();
+      activeFgSpy.clear();
+      inactiveBgSpy.clear();
+      inactiveFgSpy.clear();
+    }
+
+    function test_default_values() {
+      compare(webView.context.activeSelectionBgColor, defaultActiveBg);
+      compare(webView.context.activeSelectionFgColor, defaultActiveFg);
+      compare(webView.context.inactiveSelectionBgColor, defaultInactiveBg);
+      compare(webView.context.inactiveSelectionFgColor, defaultInactiveFg);
+    }
+
+    function test_set_colors() {
+      webView.context.activeSelectionBgColor = red;
+      compare(activeBgSpy.count, 1);
+      compare(webView.context.activeSelectionBgColor, red);
+      webView.context.activeSelectionBgColor = red;
+      compare(activeBgSpy.count, 1);
+      webView.context.activeSelectionBgColor = green;
+      compare(activeBgSpy.count, 2);
+      compare(webView.context.activeSelectionBgColor, green);
+
+      webView.context.activeSelectionFgColor = red;
+      compare(activeFgSpy.count, 1);
+      compare(webView.context.activeSelectionFgColor, red);
+      webView.context.activeSelectionFgColor = red;
+      compare(activeFgSpy.count, 1);
+      webView.context.activeSelectionFgColor = green;
+      compare(activeFgSpy.count, 2);
+      compare(webView.context.activeSelectionFgColor, green);
+
+      webView.context.inactiveSelectionBgColor = red;
+      compare(inactiveBgSpy.count, 1);
+      compare(webView.context.inactiveSelectionBgColor, red);
+      webView.context.inactiveSelectionBgColor = red;
+      compare(inactiveBgSpy.count, 1);
+      webView.context.inactiveSelectionBgColor = green;
+      compare(inactiveBgSpy.count, 2);
+      compare(webView.context.inactiveSelectionBgColor, green);
+
+      webView.context.inactiveSelectionFgColor = red;
+      compare(inactiveFgSpy.count, 1);
+      compare(webView.context.inactiveSelectionFgColor, red);
+      webView.context.inactiveSelectionFgColor = red;
+      compare(inactiveFgSpy.count, 1);
+      webView.context.inactiveSelectionFgColor = green;
+      compare(inactiveFgSpy.count, 2);
+      compare(webView.context.inactiveSelectionFgColor, green);
+    }
+  }
+}

=== modified file 'shared/browser/oxide_browser_context.cc'
--- shared/browser/oxide_browser_context.cc	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_browser_context.cc	2016-02-08 18:10:28 +0000
@@ -193,7 +193,11 @@
         popup_blocker_enabled(true),
         host_mapping_rules(params.host_mapping_rules),
         user_agent_settings(new UserAgentSettingsIOData(context)),
-        do_not_track(false) {}
+        do_not_track(false),
+        active_selection_bg_color(SK_ColorTRANSPARENT),
+        active_selection_fg_color(SK_ColorTRANSPARENT),
+        inactive_selection_bg_color(SK_ColorTRANSPARENT),
+        inactive_selection_fg_color(SK_ColorTRANSPARENT) {}
 
   mutable base::Lock lock;
 
@@ -211,6 +215,11 @@
 
   bool do_not_track;
 
+  SkColor active_selection_bg_color;
+  SkColor active_selection_fg_color;
+  SkColor inactive_selection_bg_color;
+  SkColor inactive_selection_fg_color;
+
   scoped_refptr<BrowserContextDelegate> delegate;
 };
 
@@ -353,6 +362,30 @@
   return data.do_not_track;
 }
 
+SkColor BrowserContextIOData::GetActiveSelectionBgColor() const {
+  const BrowserContextSharedIOData& data = GetSharedData();
+  base::AutoLock lock(data.lock);
+  return data.active_selection_bg_color;
+}
+
+SkColor BrowserContextIOData::GetActiveSelectionFgColor() const {
+  const BrowserContextSharedIOData& data = GetSharedData();
+  base::AutoLock lock(data.lock);
+  return data.active_selection_fg_color;
+}
+
+SkColor BrowserContextIOData::GetInactiveSelectionBgColor() const {
+  const BrowserContextSharedIOData& data = GetSharedData();
+  base::AutoLock lock(data.lock);
+  return data.inactive_selection_bg_color;
+}
+
+SkColor BrowserContextIOData::GetInactiveSelectionFgColor() const {
+  const BrowserContextSharedIOData& data = GetSharedData();
+  base::AutoLock lock(data.lock);
+  return data.inactive_selection_fg_color;
+}
+
 URLRequestContext* BrowserContextIOData::CreateMainRequestContext(
     content::ProtocolHandlerMap& protocol_handlers,
     content::URLRequestInterceptorScopedVector request_interceptors) {
@@ -886,7 +919,6 @@
   return io_data()->cookie_store_;
 }
 
-
 TemporarySavedPermissionContext*
 BrowserContext::GetTemporarySavedPermissionContext() const {
   DCHECK(CalledOnValidThread());
@@ -915,4 +947,92 @@
   }
 }
 
+SkColor BrowserContext::GetActiveSelectionBgColor() const {
+  DCHECK(CalledOnValidThread());
+  return io_data()->GetSharedData().active_selection_bg_color;
+}
+
+void BrowserContext::SetActiveSelectionBgColor(SkColor color) {
+  DCHECK(CalledOnValidThread());
+
+  BrowserContextSharedIOData& data = io_data()->GetSharedData();
+  base::AutoLock lock(data.lock);
+  data.active_selection_bg_color = color;
+
+  FOR_EACH_OBSERVER(BrowserContextObserver,
+                    GetOriginalContext()->observers_,
+                    NotifySelectionColorsChanged());
+  if (HasOffTheRecordContext()) {
+    FOR_EACH_OBSERVER(BrowserContextObserver,
+                      GetOffTheRecordContext()->observers_,
+                      NotifySelectionColorsChanged());
+  }
+}
+
+SkColor BrowserContext::GetActiveSelectionFgColor() const {
+  DCHECK(CalledOnValidThread());
+  return io_data()->GetSharedData().active_selection_fg_color;
+}
+
+void BrowserContext::SetActiveSelectionFgColor(SkColor color) {
+  DCHECK(CalledOnValidThread());
+
+  BrowserContextSharedIOData& data = io_data()->GetSharedData();
+  base::AutoLock lock(data.lock);
+  data.active_selection_fg_color = color;
+
+  FOR_EACH_OBSERVER(BrowserContextObserver,
+                    GetOriginalContext()->observers_,
+                    NotifySelectionColorsChanged());
+  if (HasOffTheRecordContext()) {
+    FOR_EACH_OBSERVER(BrowserContextObserver,
+                      GetOffTheRecordContext()->observers_,
+                      NotifySelectionColorsChanged());
+  }
+}
+
+SkColor BrowserContext::GetInactiveSelectionBgColor() const {
+  DCHECK(CalledOnValidThread());
+  return io_data()->GetSharedData().inactive_selection_bg_color;
+}
+
+void BrowserContext::SetInactiveSelectionBgColor(SkColor color) {
+  DCHECK(CalledOnValidThread());
+
+  BrowserContextSharedIOData& data = io_data()->GetSharedData();
+  base::AutoLock lock(data.lock);
+  data.inactive_selection_bg_color = color;
+
+  FOR_EACH_OBSERVER(BrowserContextObserver,
+                    GetOriginalContext()->observers_,
+                    NotifySelectionColorsChanged());
+  if (HasOffTheRecordContext()) {
+    FOR_EACH_OBSERVER(BrowserContextObserver,
+                      GetOffTheRecordContext()->observers_,
+                      NotifySelectionColorsChanged());
+  }
+}
+
+SkColor BrowserContext::GetInactiveSelectionFgColor() const {
+  DCHECK(CalledOnValidThread());
+  return io_data()->GetSharedData().inactive_selection_fg_color;
+}
+
+void BrowserContext::SetInactiveSelectionFgColor(SkColor color) {
+  DCHECK(CalledOnValidThread());
+
+  BrowserContextSharedIOData& data = io_data()->GetSharedData();
+  base::AutoLock lock(data.lock);
+  data.inactive_selection_fg_color = color;
+
+  FOR_EACH_OBSERVER(BrowserContextObserver,
+                    GetOriginalContext()->observers_,
+                    NotifySelectionColorsChanged());
+  if (HasOffTheRecordContext()) {
+    FOR_EACH_OBSERVER(BrowserContextObserver,
+                      GetOffTheRecordContext()->observers_,
+                      NotifySelectionColorsChanged());
+  }
+}
+
 } // namespace oxide

=== modified file 'shared/browser/oxide_browser_context.h'
--- shared/browser/oxide_browser_context.h	2016-01-04 13:40:25 +0000
+++ shared/browser/oxide_browser_context.h	2016-02-08 18:10:28 +0000
@@ -31,6 +31,7 @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "net/base/static_cookie_policy.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 namespace content {
 class ResourceContext;
@@ -89,6 +90,11 @@
 
   bool GetDoNotTrack() const;
 
+  SkColor GetActiveSelectionBgColor() const;
+  SkColor GetActiveSelectionFgColor() const;
+  SkColor GetInactiveSelectionBgColor() const;
+  SkColor GetInactiveSelectionFgColor() const;
+
   virtual bool IsOffTheRecord() const = 0;
 
   URLRequestContext* CreateMainRequestContext(
@@ -220,6 +226,18 @@
   bool GetDoNotTrack() const;
   void SetDoNotTrack(bool dnt);
 
+  SkColor GetActiveSelectionBgColor() const;
+  void SetActiveSelectionBgColor(SkColor color);
+
+  SkColor GetActiveSelectionFgColor() const;
+  void SetActiveSelectionFgColor(SkColor color);
+
+  SkColor GetInactiveSelectionBgColor() const;
+  void SetInactiveSelectionBgColor(SkColor color);
+
+  SkColor GetInactiveSelectionFgColor() const;
+  void SetInactiveSelectionFgColor(SkColor color);
+
   // from content::BrowserContext
   content::ResourceContext* GetResourceContext() override;
 

=== modified file 'shared/browser/oxide_browser_context_observer.h'
--- shared/browser/oxide_browser_context_observer.h	2015-06-11 17:39:35 +0000
+++ shared/browser/oxide_browser_context_observer.h	2016-02-08 18:10:28 +0000
@@ -1,5 +1,5 @@
 // vim:expandtab:shiftwidth=2:tabstop=2:
-// Copyright (C) 2013 Canonical Ltd.
+// Copyright (C) 2013-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
@@ -32,6 +32,8 @@
 
   virtual void NotifyDoNotTrackChanged() {}
 
+  virtual void NotifySelectionColorsChanged() {}
+
  protected:
   BrowserContextObserver();
   BrowserContextObserver(BrowserContext* context);

=== modified file 'shared/browser/oxide_web_view_contents_helper.cc'
--- shared/browser/oxide_web_view_contents_helper.cc	2015-10-15 08:32:01 +0000
+++ shared/browser/oxide_web_view_contents_helper.cc	2016-02-08 18:10:28 +0000
@@ -21,6 +21,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
+#include "third_party/skia/include/core/SkColor.h"
 
 #include "shared/common/oxide_content_client.h"
 
@@ -72,6 +73,42 @@
   rvh->SyncRendererPrefs();
 }
 
+void WebViewContentsHelper::NotifySelectionColorsChanged() {
+  UpdateSelectionColors();
+
+  // Send the new selection colors to the renderer.
+  content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
+  if (!rvh) {
+    return;
+  }
+  rvh->SyncRendererPrefs();
+}
+
+void WebViewContentsHelper::UpdateSelectionColors() const {
+  content::RendererPreferences* renderer_prefs =
+      web_contents_->GetMutableRendererPrefs();
+
+  SkColor active_selection_bg_color = context_->GetActiveSelectionBgColor();
+  if (active_selection_bg_color != SK_ColorTRANSPARENT) {
+    renderer_prefs->active_selection_bg_color = active_selection_bg_color;
+  }
+
+  SkColor active_selection_fg_color = context_->GetActiveSelectionFgColor();
+  if (active_selection_fg_color != SK_ColorTRANSPARENT) {
+    renderer_prefs->active_selection_fg_color = active_selection_fg_color;
+  }
+
+  SkColor inactive_selection_bg_color = context_->GetInactiveSelectionBgColor();
+  if (inactive_selection_bg_color != SK_ColorTRANSPARENT) {
+    renderer_prefs->inactive_selection_bg_color = inactive_selection_bg_color;
+  }
+
+  SkColor inactive_selection_fg_color = context_->GetInactiveSelectionFgColor();
+  if (inactive_selection_fg_color != SK_ColorTRANSPARENT) {
+    renderer_prefs->inactive_selection_fg_color = inactive_selection_fg_color;
+  }
+}
+
 WebViewContentsHelper::WebViewContentsHelper(content::WebContents* contents,
                                              content::WebContents* opener)
     : BrowserContextObserver(
@@ -87,6 +124,8 @@
       web_contents_->GetMutableRendererPrefs();
   renderer_prefs->enable_do_not_track = context_->GetDoNotTrack();
 
+  UpdateSelectionColors();
+
   content::RenderViewHost* rvh = web_contents_->GetRenderViewHost();
   if (rvh) {
     rvh->SyncRendererPrefs();

=== modified file 'shared/browser/oxide_web_view_contents_helper.h'
--- shared/browser/oxide_web_view_contents_helper.h	2015-06-11 17:39:35 +0000
+++ shared/browser/oxide_web_view_contents_helper.h	2016-02-08 18:10:28 +0000
@@ -63,10 +63,13 @@
   // BrowserContextObserver implementation
   void NotifyPopupBlockerEnabledChanged() final;
   void NotifyDoNotTrackChanged() final;
+  void NotifySelectionColorsChanged() final;
 
   // WebPreferencesObserver implementation
   void WebPreferencesValueChanged() final;
 
+  void UpdateSelectionColors() const;
+
   scoped_refptr<BrowserContext> context_;
   content::WebContents* web_contents_;