Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: chrome://gpu failing to load #39556

Merged
merged 1 commit into from
Aug 21, 2023
Merged

fix: chrome://gpu failing to load #39556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions electron_paks.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
"$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
"$root_gen_dir/content/content_resources.pak",

Check failure on line 63 in electron_paks.gni

View check run for this annotation

trop / Backportable? - 25-x-y

electron_paks.gni#L63 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +      "$root_gen_dir/content/dev_ui_content_resources.pak",
++=======
+       "$root_gen_dir/content/gpu_resources.pak",
++>>>>>>> fix: chrome://gpu failing to load

Check failure on line 63 in electron_paks.gni

View check run for this annotation

trop / Backportable? - 25-x-y

electron_paks.gni#L63 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +      "$root_gen_dir/content/dev_ui_content_resources.pak",
++=======
+       "$root_gen_dir/content/gpu_resources.pak",
++>>>>>>> fix: chrome://gpu failing to load
"$root_gen_dir/content/gpu_resources.pak",
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
"$root_gen_dir/net/net_resources.pak",
"$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
Expand All @@ -74,8 +75,9 @@
"//chrome/common:resources",
"//components/resources",
"//content:content_resources",
"//content/browser/resources/gpu:resources",
"//content/browser/resources/media:resources",
"//content/browser/tracing:resources",

Check failure on line 80 in electron_paks.gni

View check run for this annotation

trop / Backportable? - 25-x-y

electron_paks.gni#L80 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +      "//content:dev_ui_content_resources",
++=======
+       "//content/browser/resources/gpu:resources",
++>>>>>>> fix: chrome://gpu failing to load

Check failure on line 80 in electron_paks.gni

View check run for this annotation

trop / Backportable? - 25-x-y

electron_paks.gni#L80 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +      "//content:dev_ui_content_resources",
++=======
+       "//content/browser/resources/gpu:resources",
++>>>>>>> fix: chrome://gpu failing to load
"//content/browser/webrtc/resources",
"//electron:resources",
"//mojo/public/js:resources",
Expand Down
26 changes: 24 additions & 2 deletions spec/chromium-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2050,10 +2050,32 @@ describe('chromium features', () => {
});
});

describe('chrome://accessibility', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
await w.loadURL('chrome://accessibility');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
expect(pageExists).to.be.true();
});
});

describe('chrome://gpu', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
await w.loadURL('chrome://gpu');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
expect(pageExists).to.be.true();
});
});

describe('chrome://media-internals', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
w.loadURL('chrome://media-internals');
await w.loadURL('chrome://media-internals');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
Expand All @@ -2064,7 +2086,7 @@ describe('chromium features', () => {
describe('chrome://webrtc-internals', () => {
it('loads the page successfully', async () => {
const w = new BrowserWindow({ show: false });
w.loadURL('chrome://webrtc-internals');
await w.loadURL('chrome://webrtc-internals');
const pageExists = await w.webContents.executeJavaScript(
"window.hasOwnProperty('chrome') && window.chrome.hasOwnProperty('send')"
);
Expand Down