Adding sources of 47.0.2631.79

operasoftware · Sep 4, 2017 · 458404f · 458404f
1 parent fdfa571
commit 458404f
Show file tree

Hide file tree

Showing 11,870 changed files with 916,999 additions and 666,028 deletions.
diff --git a/lgpl/sources/chromium/src/base/third_party/xdg_mime/README.chromium b/lgpl/sources/chromium/src/base/third_party/xdg_mime/README.chromium
@@ -10,4 +10,5 @@ In addition, we have the following patch(es):
   - compile.patch: small tweaks to make the code compile.
   - free_pointer_later.patch: small patch that fixes potential crash in
       xdg_mime_get_mime_type_for_file() - use of pointer after being freed.
+  - function_casts.patch: fix bad function casts.
   - Added a LICENSE file.
diff --git a/lgpl/sources/chromium/src/base/third_party/xdg_mime/function_casts.patch b/lgpl/sources/chromium/src/base/third_party/xdg_mime/function_casts.patch
@@ -0,0 +1,44 @@
+diff --git a/base/third_party/xdg_mime/xdgmime.c b/base/third_party/xdg_mime/xdgmime.c
+index 6dc58c253fa2..f340fcefabb4 100644
+--- a/base/third_party/xdg_mime/xdgmime.c
++++ b/base/third_party/xdg_mime/xdgmime.c
+@@ -136,7 +136,7 @@ xdg_dir_time_list_free (XdgDirTimeList *list)
+ }
+
+ static int
+-xdg_mime_init_from_directory (const char *directory)
++xdg_mime_init_from_directory (const char *directory, void *user_data)
+ {
+   char *file_name;
+   struct stat st;
+@@ -340,8 +340,9 @@ xdg_check_file (const char *file_path,
+
+ static int
+ xdg_check_dir (const char *directory,
+-	       int        *invalid_dir_list)
++	       void       *user_data)
+ {
++  int *invalid_dir_list = user_data;
+   int invalid, exists;
+   char *file_name;
+
+@@ -398,8 +399,7 @@ xdg_check_dirs (void)
+   for (list = dir_time_list; list; list = list->next)
+     list->checked = XDG_CHECKED_UNCHECKED;
+
+-  xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_check_dir,
+-			   &invalid_dir_list);
++  xdg_run_command_on_dirs (xdg_check_dir, &invalid_dir_list);
+
+   if (invalid_dir_list)
+     return TRUE;
+@@ -455,8 +455,7 @@ xdg_mime_init (void)
+       icon_list = _xdg_mime_icon_list_new ();
+       generic_icon_list = _xdg_mime_icon_list_new ();
+
+-      xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_mime_init_from_directory,
+-			       NULL);
++      xdg_run_command_on_dirs (xdg_mime_init_from_directory, NULL);
+
+       need_reread = FALSE;
+     }
diff --git a/lgpl/sources/chromium/src/base/third_party/xdg_mime/xdgmime.c b/lgpl/sources/chromium/src/base/third_party/xdg_mime/xdgmime.c
@@ -136,7 +136,7 @@ xdg_dir_time_list_free (XdgDirTimeList *list)
 }
 
 static int
-xdg_mime_init_from_directory (const char *directory)
+xdg_mime_init_from_directory (const char *directory, void *user_data)
 {
   char *file_name;
   struct stat st;
@@ -340,8 +340,9 @@ xdg_check_file (const char *file_path,
 
 static int
 xdg_check_dir (const char *directory,
-	       int        *invalid_dir_list)
+	       void       *user_data)
 {
+  int *invalid_dir_list = user_data;
   int invalid, exists;
   char *file_name;
 
@@ -398,8 +399,7 @@ xdg_check_dirs (void)
   for (list = dir_time_list; list; list = list->next)
     list->checked = XDG_CHECKED_UNCHECKED;
 
-  xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_check_dir,
-			   &invalid_dir_list);
+  xdg_run_command_on_dirs (xdg_check_dir, &invalid_dir_list);
 
   if (invalid_dir_list)
     return TRUE;
@@ -455,8 +455,7 @@ xdg_mime_init (void)
       icon_list = _xdg_mime_icon_list_new ();
       generic_icon_list = _xdg_mime_icon_list_new ();
 
-      xdg_run_command_on_dirs ((XdgDirectoryFunc) xdg_mime_init_from_directory,
-			       NULL);
+      xdg_run_command_on_dirs (xdg_mime_init_from_directory, NULL);
 
       need_reread = FALSE;
     }

diff --git a/lgpl/sources/chromium/src/chrome/test/data/BUILD.gn b/lgpl/sources/chromium/src/chrome/test/data/BUILD.gn
@@ -8,7 +8,6 @@ import("//tools/grit/grit_rule.gni")
 grit("webui_test_resources") {
   source = "webui_test_resources.grd"
   defines = chrome_grit_defines
-  use_qualified_include = true
   outputs = [
     "test/data/grit/webui_test_resources.h",
     "webui_test_resources.pak",

diff --git a/lgpl/sources/chromium/src/chrome/test/data/ads_observer/docwrite_provisional_frame.html b/lgpl/sources/chromium/src/chrome/test/data/ads_observer/docwrite_provisional_frame.html
@@ -0,0 +1,20 @@
+<html>
+<iframe id="slow_frame" name="google_ads_iframe" src="/slow?100"></iframe>
+
+<script>
+  window.addEventListener('message', function(e) {
+    domAutomationController.setAutomationId(0);
+    window.domAutomationController.send(e.data);
+  });
+
+  // slow takes 100 seconds to load, plenty of time to overwrite the
+  // provisional load.
+  let iframe = document.getElementById("slow_frame");
+  let doc = iframe.contentDocument;
+
+  doc.open();
+  doc.write("<html>Rewritten. <img src=pixel.png> <img src=pixel2.png> <img src=pixel3.png onload='parent.postMessage(&quot;loaded&quot;, &quot;*&quot;);'></html>");
+  doc.close();
+</script>
+
+</html>
diff --git a/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel.png b/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel.png
diff --git a/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel2.png b/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel2.png
diff --git a/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel3.png b/lgpl/sources/chromium/src/chrome/test/data/ads_observer/pixel3.png
diff --git a/lgpl/sources/chromium/src/chrome/test/data/android/appindexing/json-ld.html b/lgpl/sources/chromium/src/chrome/test/data/android/appindexing/json-ld.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>JSON-LD for AppIndexing Test</title>
+  <script type="application/ld+json">
+    {"@context":"http://schema.org","@type":"Hotel","name":"Hotel Name"}
+  </script>
+</head>
+<body>
+</body>
+</html>
diff --git a/...ces/chromium/src/chrome/test/data/android/content_view_focus/content_view_blur_focus.html b/...ces/chromium/src/chrome/test/data/android/content_view_focus/content_view_blur_focus.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+  <body>
+    <script>
+      window.onblur = function() { document.title='blurred' };
+      window.onfocus = function() { document.title='focused' };
+      document.title = 'initial';
+    </script>
+  </body>
+</html>
diff --git a/lgpl/sources/chromium/src/chrome/test/data/android/contextmenu/context_menu_test.html b/lgpl/sources/chromium/src/chrome/test/data/android/contextmenu/context_menu_test.html
@@ -4,7 +4,7 @@
 </head>
 <body>
 
-  <img src="test_image.png" id="testImage" /><br />
+  <img src="test_image.png" id="testImage" alt="test_image"/><br />
 
   <a href="test_link.html" id="testLink">Test Link</a><br />
 

diff --git a/lgpl/sources/chromium/src/chrome/test/data/android/popup_test.html b/lgpl/sources/chromium/src/chrome/test/data/android/popup_test.html
@@ -3,9 +3,9 @@
     <title>Popup test page</title>
     <script type="text/javascript">
       function spawnWindows() {
-        window.open('data:text/html,<html><head><title>Popup #1</title></head><body /></html>');
-        window.open('data:text/html,<html><head><title>Popup #2</title></head><body /></html>');
-        window.open('data:text/html,<html><head><title>Popup #3</title></head><body /></html>');
+        window.open('navigate/one.html');
+        window.open('navigate/two.html');
+        window.open('navigate/three.html');
       }
     </script>
   </head>

diff --git a/.../render_tests/ArticleSnippetsTest.long_minimal_snippet_narrow.Nexus_5X.port.png b/.../render_tests/ArticleSnippetsTest.long_minimal_snippet_narrow.Nexus_5X.port.png
diff --git a/...st/data/android/render_tests/ArticleSnippetsTest.long_snippet.Nexus_5X.port.png b/...st/data/android/render_tests/ArticleSnippetsTest.long_snippet.Nexus_5X.port.png
diff --git a/.../android/render_tests/ArticleSnippetsTest.long_snippet_narrow.Nexus_5X.port.png b/.../android/render_tests/ArticleSnippetsTest.long_snippet_narrow.Nexus_5X.port.png
diff --git a/...data/android/render_tests/ArticleSnippetsTest.minimal_snippet.Nexus_5X.port.png b/...data/android/render_tests/ArticleSnippetsTest.minimal_snippet.Nexus_5X.port.png
diff --git a/...render_tests/ArticleSnippetsTest.short_minimal_snippet_narrow.Nexus_5X.port.png b/...render_tests/ArticleSnippetsTest.short_minimal_snippet_narrow.Nexus_5X.port.png
diff --git a/...t/data/android/render_tests/ArticleSnippetsTest.short_snippet.Nexus_5X.port.png b/...t/data/android/render_tests/ArticleSnippetsTest.short_snippet.Nexus_5X.port.png
diff --git a/...android/render_tests/ArticleSnippetsTest.short_snippet_narrow.Nexus_5X.port.png b/...android/render_tests/ArticleSnippetsTest.short_snippet_narrow.Nexus_5X.port.png
diff --git a/...e/test/data/android/render_tests/ArticleSnippetsTest.snippets.Nexus_5X.port.png b/...e/test/data/android/render_tests/ArticleSnippetsTest.snippets.Nexus_5X.port.png
diff --git a/...data/android/render_tests/ArticleSnippetsTest.snippets_narrow.Nexus_5X.port.png b/...data/android/render_tests/ArticleSnippetsTest.snippets_narrow.Nexus_5X.port.png
diff --git a/.../chrome/test/data/android/render_tests/NewTabPageTest.fakebox.Nexus_5X.port.png b/.../chrome/test/data/android/render_tests/NewTabPageTest.fakebox.Nexus_5X.port.png
diff --git a/...me/test/data/android/render_tests/NewTabPageTest.most_visited.Nexus_5X.port.png b/...me/test/data/android/render_tests/NewTabPageTest.most_visited.Nexus_5X.port.png
diff --git a/...me/test/data/android/render_tests/NewTabPageTest.new_tab_page.Nexus_5X.port.png b/...me/test/data/android/render_tests/NewTabPageTest.new_tab_page.Nexus_5X.port.png
diff --git a/...ata/android/render_tests/NewTabPageTest.new_tab_page_scrolled.Nexus_5X.port.png b/...ata/android/render_tests/NewTabPageTest.new_tab_page_scrolled.Nexus_5X.port.png
diff --git a/.../chromium/src/chrome/test/data/android/webvr_instrumentation/html/generic_webvr_page.html b/.../chromium/src/chrome/test/data/android/webvr_instrumentation/html/generic_webvr_page.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<!--
+WebVR page without any code specific to one test
+-->
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../resources/webvr_e2e.css">
+  </head>
+  <body>
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/webvr_boilerplate.js"></script>
+  </body>
+</html>
diff --git a/.../data/android/webvr_instrumentation/html/test_device_capabilities_match_expectations.html b/.../data/android/webvr_instrumentation/html/test_device_capabilities_match_expectations.html
@@ -0,0 +1,53 @@
+<!doctype html>
+<!--
+Tests that the reported device capabilities match expectations.
+-->
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../resources/webvr_e2e.css">
+  </head>
+  <body>
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/webvr_boilerplate.js"></script>
+    <script>
+      // All the current test devices have the same expectations, but that will
+      // change with additional device support, especially desktop.
+      var android_expectation = {
+        "isPresenting": false,
+        "capabilities": {
+          "hasPosition": false,
+          "hasExternalDisplay": false,
+          "canPresent": true,
+          "maxLayers": 1,
+        },
+      }
+      var expectations = {
+        "angler": android_expectation,  // Nexus 6P
+        "bullhead": android_expectation,  // Nexus 5X
+        "hammerhead": android_expectation,  // Nexus 5
+        "marlin": android_expectation,  // Pixel XL
+        "sailfish": android_expectation,  // Pixel
+      }
+      var t = async_test("Device capabilities match expectations");
+      function stepCheckDeviceCapabilities(device) {
+        if (!(device in expectations)) {
+          t.step_func_done( () => {
+            assert_unreached("Given device " + device + " not in expectations");
+          })();
+          return;
+        }
+        let expectation = expectations[device];
+        t.step_func_done( () => {
+          assert_equals(vrDisplay["isPresenting"], expectation["isPresenting"]);
+          for (var capability in expectation["capabilities"]) {
+            assert_equals(vrDisplay["capabilities"][capability],
+                          expectation["capabilities"][capability],
+                          capability);
+          }
+        })();
+      }
+    </script>
+  </body>
+</html>
diff --git a/...mium/src/chrome/test/data/android/webvr_instrumentation/html/test_navigation_2d_page.html b/...mium/src/chrome/test/data/android/webvr_instrumentation/html/test_navigation_2d_page.html
@@ -0,0 +1,9 @@
+<!doctype html>
+<!-- 2D page to test transitions. -->
+<html>
+  <body>
+    <input type="checkbox" onclick="setFullscreen(this)" id="fullscreen">Fullscreen
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/navigation_e2e.js"></script>
+  </body>
+</html>
diff --git a/...m/src/chrome/test/data/android/webvr_instrumentation/html/test_navigation_webvr_page.html b/...m/src/chrome/test/data/android/webvr_instrumentation/html/test_navigation_webvr_page.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<!-- WebVR page to test transitions. -->
+<html>
+  <body>
+    <input type="checkbox" onclick="setFullscreen(this)" id="fullscreen">Fullscreen
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/webvr_boilerplate.js"></script>
+    <script src="../resources/navigation_e2e.js"></script>
+  </body>
+</html>
diff --git a/...chrome/test/data/android/webvr_instrumentation/html/test_nfc_fires_vrdisplayactivate.html b/...chrome/test/data/android/webvr_instrumentation/html/test_nfc_fires_vrdisplayactivate.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<!--
+Tests that scanning the Daydream View NFC tag on supported devices fires the
+vrdisplayactivate event
+-->
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../resources/webvr_e2e.css">
+  </head>
+  <body>
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script>
+      var t = async_test("NFC scan fires the vrdisplayactivate event");
+      window.addEventListener("vrdisplayactivate", () => {t.done();}, false);
+      // NFC scan triggered after page load
+    </script>
+  </body>
+</html>
diff --git a/...src/chrome/test/data/android/webvr_instrumentation/html/test_pose_data_unfocused_tab.html b/...src/chrome/test/data/android/webvr_instrumentation/html/test_pose_data_unfocused_tab.html
@@ -26,7 +26,7 @@
             assert_true(fd.pose != null,
                 "frame data's pose is non-null");
           });
-          finishJavascriptStep();
+          finishJavaScriptStep();
         }
         // Make sure at least one rAF call has happened so we get valid data
         window.requestAnimationFrame(onAnimationFrame);

diff --git a/...rc/chrome/test/data/android/webvr_instrumentation/html/test_presentation_locks_focus.html b/...rc/chrome/test/data/android/webvr_instrumentation/html/test_presentation_locks_focus.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<!--
+Tests that when a screen taps causes a frame that isn't presenting to gain
+focus, that the presenting frame still receives input.
+-->
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../resources/webvr_e2e.css">
+  </head>
+  <body>
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/webvr_boilerplate.js"></script>
+    <script>
+      var t = async_test("Focus is locked to presentation");
+      var rafCount = 0;
+      window.onfocus = function() {
+        onAnimationFrameCallback = null;
+        setTimeout(function() {
+          document.getElementById('externalframe').contentWindow.focus();
+        }, 1000);
+      };
+      window.onblur = function() {
+        onAnimationFrameCallback = function() {
+          if (rafCount = 3) {
+            t.done();
+          }
+          rafCount++;
+        }
+      }
+    </script>
+    <iframe id="externalframe" width="1" height="1" src="about:blank" />
+  </body>
+</html>
diff --git a/...rc/chrome/test/data/android/webvr_instrumentation/html/test_requestPresent_enters_vr.html b/...rc/chrome/test/data/android/webvr_instrumentation/html/test_requestPresent_enters_vr.html
@@ -13,7 +13,7 @@
     <script src="../resources/webvr_boilerplate.js"></script>
     <script>
       var t = async_test("A successful requestPresent call actually enters VR");
-      window.addEventListener("onvrdisplaypresentchange", () => {t.done();}, false);
+      window.addEventListener("vrdisplaypresentchange", () => {t.done();}, false);
     </script>
   </body>
 </html>
diff --git a/.../data/android/webvr_instrumentation/html/test_screen_taps_not_registered_on_daydream.html b/.../data/android/webvr_instrumentation/html/test_screen_taps_not_registered_on_daydream.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<!--
+Tests that screen taps aren't registered while in VR when viewer is
+Daydream View
+-->
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="../resources/webvr_e2e.css">
+  </head>
+  <body>
+    <canvas id="webgl-canvas"></canvas>
+    <script src="../../../../../../third_party/WebKit/LayoutTests/resources/testharness.js"></script>
+    <script src="../resources/webvr_e2e.js"></script>
+    <script src="../resources/webvr_boilerplate.js"></script>
+    <script>
+      var t = async_test("Screen taps not registered when in VR w/ DD View");
+      window.addEventListener("vrdisplaypresentchange",
+          () => {finishJavaScriptStep();}, false);
+      var numTaps = 0;
+      webglCanvas.addEventListener("click", () => {numTaps++;}, false);
+
+      function stepVerifyNoInitialTaps() {
+        t.step( () => {
+          assert_equals(numTaps, 0, "No initial taps");
+        });
+        finishJavaScriptStep();
+      }
+
+      function stepVerifyNoAdditionalTaps() {
+          t.step_func_done( () => {
+            // We expect 1 tap from entering VR
+            assert_equals(numTaps, 1,
+                "Only one tap registered after two taps given");
+          })();
+      }
+
+    </script>
+  </body>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ @@
     </head>
     <body>
-      <img src="test_image.png" id="testImage" /><br />
+      <img src="test_image.png" id="testImage" alt="test_image"/><br />
       <a href="test_link.html" id="testLink">Test Link</a><br />
@@ Expand Down @@