mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
chore: bump chromium to 102.0.5005.27 (19-x-y) (#33932)
* chore: bump chromium in DEPS to 102.0.5005.12 * chore: bump chromium in DEPS to 102.0.5005.22 * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 (cherry picked from commit 75d75bc087a29640cc58ecb7122dbc8ea10ce785) * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 (cherry picked from commit b12e658fee8f8d8832145f0ab141549c3466f567) * chore: bump chromium in DEPS to 102.0.5005.27 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commit9ccc4d6249) * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 (cherry picked from commit5c5bc4ca6d) * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commitdbdff6fe7e) * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 (cherry picked from commitc02749954c) * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * fixup for lint Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
This commit is contained in:
committed by
GitHub
parent
7f88b507d9
commit
04f2b2e2e3
@@ -38,8 +38,7 @@ MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
|
||||
RefreshColorCache(theme);
|
||||
UpdateViewColors();
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
SetBackground(
|
||||
views::CreateThemedSolidBackground(this, ui::kColorMenuBackground));
|
||||
SetBackground(views::CreateThemedSolidBackground(ui::kColorMenuBackground));
|
||||
background_color_ = GetBackground()->get_color();
|
||||
#endif
|
||||
SetFocusBehavior(FocusBehavior::ALWAYS);
|
||||
|
||||
@@ -46,7 +46,7 @@ void WebContentsZoomController::SetEmbedderZoomController(
|
||||
}
|
||||
|
||||
void WebContentsZoomController::SetZoomLevel(double level) {
|
||||
if (!web_contents()->GetRenderViewHost()->IsRenderViewLive() ||
|
||||
if (!web_contents()->GetMainFrame()->IsRenderFrameLive() ||
|
||||
blink::PageZoomValuesEqual(GetZoomLevel(), level) ||
|
||||
zoom_mode_ == ZoomMode::kDisabled)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user