Google Git
Sign in
chromium / chromium / src / 1120bd3..789f25d / .
diff --git a/chromeos/CHROMEOS_LKGM b/chromeos/CHROMEOS_LKGM
index 851dc39..8e84d0be 100644
--- a/chromeos/CHROMEOS_LKGM
+++ b/chromeos/CHROMEOS_LKGM

@@ -1 +1 @@
-7943.0.0
\ No newline at end of file
+7946.0.0
\ No newline at end of file

diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn
index df8f877..9b834d02 100644
--- a/remoting/BUILD.gn
+++ b/remoting/BUILD.gn

@@ -75,6 +75,20 @@
   }
 }
 
+if (is_win) {
+  # GYP version: remoting/remoting_host_win.gypi:remoting_breakpad_tester
+  executable("remoting_breakpad_tester") {
+    deps = [
+      "//base",
+      "//remoting/host",
+    ]
+
+    sources = [
+      "tools/breakpad_tester_win.cc",
+    ]
+  }
+}
+
 # GYP version: remoting/remoting_test.gypi:remoting_test_support
 source_set("test_support") {
   testonly = true

diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index 03bce1e3..8a918fa 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn

@@ -336,7 +336,7 @@
                          [
                            remoting_srcs_gypi_values.daemon_controller_guid,
                            remoting_srcs_gypi_values.rdp_desktop_session_guid,
-                           version_full,
+                           chrome_version_full,
                          ],
                          "value")
     daemon_controller_clsid = clsids[0]

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2-expected.html
index 9f783b4..6d7f2304 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2-expected.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2-expected.html

@@ -6,8 +6,8 @@
 p {
 	font-family: ahem;
 	background: yellow;
-	-webkit-column-rule: 1em solid lime;
-	-webkit-columns: 2;
+	column-rule: 1em solid lime;
+	columns: 2;
 	margin: 0 auto;
 	width: 200px;
 }

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2.html
index e46f97d7..13b98d1 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-2.html

@@ -15,8 +15,8 @@
 p {
 	font-family: ahem;
 	background: yellow;
-	-webkit-column-rule: 1em solid lime;
-	-webkit-columns: 2;
+	column-rule: 1em solid lime;
+	columns: 2;
 	margin: 0;
 	width: 200px;
 }

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-expected.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-expected.html
index ae858d7..3c8e1f4 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-expected.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems-expected.html

@@ -8,8 +8,8 @@
 p {
 	font-family: monospace;
 	background: yellow;
-	-webkit-column-rule: 1em solid lime;
-	-webkit-columns: 2;
+	column-rule: 1em solid lime;
+	columns: 2;
 	width: 200px;
 	margin: 0 auto;
 }

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems.html
index b3ed842..0a7e4d9d 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns-flexitems.html

@@ -14,8 +14,8 @@
 p {
 	font-family: monospace;
 	background: yellow;
-	-webkit-column-rule: 1em solid lime;
-	-webkit-columns: 2;
+	column-rule: 1em solid lime;
+	columns: 2;
 	width: 200px;
 	margin: 0;
 }

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns.html
index 0e61e4f..00e2daba 100644
--- a/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns.html
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-flexbox-1/flexbox_columns.html

@@ -12,8 +12,8 @@
 
 	display: flex;
 	justify-content: space-around;
-	-webkit-columns: 3;
-	-webkit-column-rule: 1em solid red;
+	columns: 3;
+	column-rule: 1em solid red;
 }
 </style>
 

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001-expected.txt b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001-expected.txt
new file mode 100644
index 0000000..53950e1
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001-expected.txt

@@ -0,0 +1,4 @@
+This is a testharness.js-based test.
+FAIL CSS Snap Size: snap-height dynamic change assert_not_equals: Height must change when snap-height changes got disallowed value 28
+Harness: the test ran to completion.
+

diff --git a/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html
new file mode 100644
index 0000000..a3fb06b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/imported/csswg-test/css-snap-size-1/snap-height-dynamic-001.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>CSS Snap Size: snap-height dynamic change</title>
+<link rel="author" title="Koji Ishii" href="kojiishi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-snap-size/#snap-height">
+<meta name="assert" content="This test asserts changing the snap-height property takes effects.">
+<meta name="flags" content="dom">
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
+<style>
+div {
+  font-size: 20px;
+  line-height: 1;
+}
+</style>
+<div id="log"></div>
+<div id="target">X</div>
+<div id="next">X</div>
+<script>
+var before = next.offsetTop;
+target.style.snapHeight = "40px";
+var after = next.offsetTop;
+forceRelayout(document.documentElement);
+var afterRelayout = next.offsetTop;
+
+test(function () {
+  assert_not_equals(after, before, "Height must change when snap-height changes");
+  assert_equals(after, afterRelayout, "Height must not change after relayout");
+});
+
+function forceRelayout(element) {
+  var saved = element.style.display;
+  element.style.display = "none";
+  element.offsetTop;
+  element.style.display = saved;
+  element.offsetTop;
+}
+</script>