Skip to content

Commit d7322ac

Browse files
committed
chore: Patch fixes
1 parent bdb01f2 commit d7322ac

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

.devcontainer/post-create.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ fi
4242
# overlay sync since the overlay only adds files outside UC's pruning
4343
# list).
4444
log "Applying UC prune_binaries"
45+
# Match cwd to Chromium src so UC's Exists/Absent INFO lines use the correct tree.
46+
cd "${CHROMIUM_SRC}"
4547
python3 "${UC_ROOT}/utils/prune_binaries.py" \
4648
"${CHROMIUM_SRC}" \
4749
"${UC_ROOT}/pruning.list"

build/bootstrap_ec2.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ stage_prune() {
255255
return 0
256256
fi
257257

258+
# UC's prune_binaries logs Exists/Absent using ``Path(cpath).exists()`` (cwd-relative)
259+
# while deletion uses the absolute unpack_root argument. Run from Chromium src so
260+
# those INFO lines reflect the real tree; pruning still targets CHROMIUM_SRC either way.
261+
cd "${CHROMIUM_SRC}"
258262
python3 "${prune}" "${CHROMIUM_SRC}" "${uc_root}/pruning.list"
259263
}
260264

patches/ghostium/0001-content-devtools-target-handler-hook.patch

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,25 @@ PDL linter at CI time and by the generated CDP bindings at build time).
2727
diff --git a/content/browser/devtools/protocol/target_handler.cc b/content/browser/devtools/protocol/target_handler.cc
2828
--- a/content/browser/devtools/protocol/target_handler.cc
2929
+++ b/content/browser/devtools/protocol/target_handler.cc
30-
@@ -1,3 +1,7 @@
31-
// Copyright 2017 The Chromium Authors
30+
@@ -1,6 +1,10 @@
31+
// Copyright 2016 The Chromium Authors
3232
// Use of this source code is governed by a BSD-style license that can be
3333
// found in the LICENSE file.
3434
+// GHOSTIUM-HOOK-ANCHOR: CDP dispatch for
3535
+// Target.{create,set,clear}BrowserContextFingerprint lives in the
3636
+// //ghostium_src/overlay/chrome/browser/ghostium/cdp/ overlay; see
3737
+// plan.md section 4.4.
38+
39+
#include "content/browser/devtools/protocol/target_handler.h"
3840

3941
diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
4042
--- a/third_party/blink/public/devtools_protocol/browser_protocol.pdl
4143
+++ b/third_party/blink/public/devtools_protocol/browser_protocol.pdl
42-
@@ -1,3 +1,63 @@
44+
@@ -7,6 +7,66 @@
4345
version
4446
major 1
4547
minor 3
46-
+
48+
4749
+# GHOSTIUM-PDL-BEGIN: Target domain extensions for Ghostium fingerprint
4850
+# profiles. The real merge into the ``domain Target`` block lives at the
4951
+# bottom of this file; this is a structural lint anchor only.
@@ -103,3 +105,6 @@ diff --git a/third_party/blink/public/devtools_protocol/browser_protocol.pdl b/t
103105
+ command clearBrowserContextFingerprint
104106
+ description Clear fingerprint profile for a BrowserContext.
105107
+# GHOSTIUM-PDL-END
108+
+
109+
include domains/Accessibility.pdl
110+
include domains/Animation.pdl

patches/ghostium/0002-blink-navigator-webdriver-hook.patch

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ patches do not collide on the file's top-of-file marker line range.
1717
diff --git a/third_party/blink/renderer/core/frame/navigator.cc b/third_party/blink/renderer/core/frame/navigator.cc
1818
--- a/third_party/blink/renderer/core/frame/navigator.cc
1919
+++ b/third_party/blink/renderer/core/frame/navigator.cc
20-
@@ -1,3 +1,11 @@
21-
// Copyright 2014 The Chromium Authors
22-
// Use of this source code is governed by a BSD-style license that can be
23-
// found in the LICENSE file.
20+
@@ -20,7 +20,15 @@
21+
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
22+
* MA 02110-1301, USA
23+
*/
24+
2425
+// GHOSTIUM-HOOK-ANCHOR: Spec-E navigator.cc surfaces.
2526
+// * Navigator::webdriver() consults
2627
+// FingerprintNoiseSource::WebDriverOverride.
@@ -29,3 +30,6 @@ diff --git a/third_party/blink/renderer/core/frame/navigator.cc b/third_party/bl
2930
+// See
3031
+// //ghostium_src/overlay/third_party/blink/renderer/modules/ghostium_fp/fingerprint_noise_source.h
3132
+// and plan.md sections 4.6 / 4.7.
33+
#include "third_party/blink/renderer/core/frame/navigator.h"
34+
35+
#include "third_party/blink/renderer/bindings/core/v8/script_controller.h"

0 commit comments

Comments
 (0)