209548 2020-03-25 10:22:03 -0700 ScopeRuleSets::initializeUserStyle() should not add console logging if there are no injected user style sheets 2020-03-26 12:00:14 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney bfulgham darin simon.fraser oldest_to_newest 1633930 0 katherine_cheney 2020-03-25 10:22:03 -0700 Logging when there are no injected user style sheets is unnecessary and confusing. 1633931 1 katherine_cheney 2020-03-25 10:22:39 -0700 <rdar://problem/60851745> 1634357 2 394616 katherine_cheney 2020-03-26 08:53:35 -0700 Created attachment 394616 Patch 1634396 3 394616 darin 2020-03-26 10:23:46 -0700 Comment on attachment 394616 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394616&action=review > Source/WebCore/ChangeLog:12 > + ScopeRuleSets::initializeUserStyle() should not add console logging if there are no injected user style sheets > + https://bugs.webkit.org/show_bug.cgi?id=209548 > + <rdar://problem/60851745> > + > + Reviewed by NOBODY (OOPS!). > + > + Logging when there are no injected user style sheets is unnecessary and confusing. > + > + * style/StyleScopeRuleSets.cpp: > + (WebCore::Style::ScopeRuleSets::initializeUserStyle): Strange indenting > Source/WebCore/style/StyleScopeRuleSets.cpp:96 > - if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain()) > + if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain() && !extensionStyleSheets.injectedUserStyleSheets().isEmpty()) > m_styleResolver.document().addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user style sheet for non-app bound domain."_s); Besides not logging, this now means we’ll call collectRulesFromUserStyleSheets on the empty vector. No harm to that I suppose. 1634449 4 394634 katherine_cheney 2020-03-26 11:29:08 -0700 Created attachment 394634 Patch for landing 1634453 5 katherine_cheney 2020-03-26 11:32:04 -0700 (In reply to Darin Adler from comment #3) > Comment on attachment 394616 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394616&action=review > Thanks Darin! > > Source/WebCore/ChangeLog:12 > > + ScopeRuleSets::initializeUserStyle() should not add console logging if there are no injected user style sheets > > + https://bugs.webkit.org/show_bug.cgi?id=209548 > > + <rdar://problem/60851745> > > + > > + Reviewed by NOBODY (OOPS!). > > + > > + Logging when there are no injected user style sheets is unnecessary and confusing. > > + > > + * style/StyleScopeRuleSets.cpp: > > + (WebCore::Style::ScopeRuleSets::initializeUserStyle): > > Strange indenting Good catch, fixed this in the patch for landing. > > > Source/WebCore/style/StyleScopeRuleSets.cpp:96 > > - if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain()) > > + if (page && page->mainFrame().loader().client().hasNavigatedAwayFromAppBoundDomain() && !extensionStyleSheets.injectedUserStyleSheets().isEmpty()) > > m_styleResolver.document().addConsoleMessage(MessageSource::Security, MessageLevel::Warning, "Ignoring user style sheet for non-app bound domain."_s); > > Besides not logging, this now means we’ll call > collectRulesFromUserStyleSheets on the empty vector. No harm to that I > suppose. I could follow up and add an if statement to check if extensionStyleSheets.injectedUserStyleSheets() is empty. I would probably also want to add one for extensionStyleSheets.documentUserStyleSheets() to be consistent. 1634454 6 darin 2020-03-26 11:32:45 -0700 (In reply to katherine_cheney from comment #5) > I could follow up and add an if statement to check if > extensionStyleSheets.injectedUserStyleSheets() is empty. I would probably > also want to add one for extensionStyleSheets.documentUserStyleSheets() to > be consistent. You should only do that if there’s a good reason. Otherwise I would suggest leaving things as-is. 1634473 7 ews-feeder 2020-03-26 12:00:13 -0700 Committed r259062: <https://trac.webkit.org/changeset/259062> All reviewed patches have been landed. Closing bug and clearing flags on attachment 394634. 394616 2020-03-26 08:53:35 -0700 2020-03-26 11:29:06 -0700 Patch bug-209548-20200326085334.patch text/plain 2028 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI3NzgyNmEzMzliODdl MGE4OWFkZjk3MWM4NmE2Yjg2NGFhNzE2Ni4uZmJmMmM5NWM5OTczYTVkNzk3YWFlNWI5Y2RlZDM4 NmI1NTgxYzIyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTI1ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgU2NvcGVSdWxl U2V0czo6aW5pdGlhbGl6ZVVzZXJTdHlsZSgpIHNob3VsZCBub3QgYWRkIGNvbnNvbGUgbG9nZ2lu ZyBpZiB0aGVyZSBhcmUgbm8gaW5qZWN0ZWQgdXNlciBzdHlsZSBzaGVldHMKKyAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA5NTQ4CisgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzYwODUxNzQ1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIExvZ2dpbmcgd2hlbiB0aGVyZSBhcmUgbm8gaW5qZWN0ZWQgdXNlciBzdHls ZSBzaGVldHMgaXMgdW5uZWNlc3NhcnkgYW5kIGNvbmZ1c2luZy4KKworICAgICAgICAqIHN0eWxl L1N0eWxlU2NvcGVSdWxlU2V0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVS dWxlU2V0czo6aW5pdGlhbGl6ZVVzZXJTdHlsZSk6CisKIDIwMjAtMDMtMjQgIEFudG9pbmUgUXVp bnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIENsZWFu IHRpbWVsaW5lIGhlYWRlcnMgdXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlU2NvcGVSdWxlU2V0cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVs ZVNldHMuY3BwCmluZGV4IGYzMjcwZDE1YTFhOGRjNTFmMGUwYWNiMDRjZjJiNGMzOTQ0ZmE3YzIu LjI5NWRmNDA0MTA3YWRjMGIzZjdiZmQ5ZTM5YjAzZDA0YjljMDRlNjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtOTIsNyArOTIsNyBAQCB2b2lk IFNjb3BlUnVsZVNldHM6OmluaXRpYWxpemVVc2VyU3R5bGUoKQogICAgIGlmIChDU1NTdHlsZVNo ZWV0KiBwYWdlVXNlclNoZWV0ID0gZXh0ZW5zaW9uU3R5bGVTaGVldHMucGFnZVVzZXJTaGVldCgp KQogICAgICAgICB0ZW1wVXNlclN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChwYWdlVXNlclNoZWV0 LT5jb250ZW50cygpLCBudWxscHRyLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yLCBtX3N0eWxlUmVzb2x2 ZXIpOwogICAgIGF1dG8qIHBhZ2UgPSBtX3N0eWxlUmVzb2x2ZXIuZG9jdW1lbnQoKS5wYWdlKCk7 Ci0gICAgaWYgKHBhZ2UgJiYgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkuY2xpZW50KCkuaGFz TmF2aWdhdGVkQXdheUZyb21BcHBCb3VuZERvbWFpbigpKQorICAgIGlmIChwYWdlICYmIHBhZ2Ut Pm1haW5GcmFtZSgpLmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3YXlGcm9tQXBwQm91 bmREb21haW4oKSAmJiAhZXh0ZW5zaW9uU3R5bGVTaGVldHMuaW5qZWN0ZWRVc2VyU3R5bGVTaGVl dHMoKS5pc0VtcHR5KCkpCiAgICAgICAgIG1fc3R5bGVSZXNvbHZlci5kb2N1bWVudCgpLmFkZENv bnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6Oldhcm5p bmcsICJJZ25vcmluZyB1c2VyIHN0eWxlIHNoZWV0IGZvciBub24tYXBwIGJvdW5kIGRvbWFpbi4i X3MpOwogICAgIGVsc2UKICAgICAgICAgY29sbGVjdFJ1bGVzRnJvbVVzZXJTdHlsZVNoZWV0cyhl eHRlbnNpb25TdHlsZVNoZWV0cy5pbmplY3RlZFVzZXJTdHlsZVNoZWV0cygpLCB0ZW1wVXNlclN0 eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yKTsK 394634 2020-03-26 11:29:08 -0700 2020-03-26 12:00:13 -0700 Patch for landing bug-209548-20200326112907.patch text/plain 2028 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI3NzgyNmEzMzliODdl MGE4OWFkZjk3MWM4NmE2Yjg2NGFhNzE2Ni4uZTRhMjNlZTc3MjkzNmQ5OTE5Y2UxYzdhOTMzNGZm ZGMzMDcxZGRlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTAzLTI1ICBLYXRl IENoZW5leSAgPGthdGhlcmluZV9jaGVuZXlAYXBwbGUuY29tPgorCisgICAgICAgIFNjb3BlUnVs ZVNldHM6OmluaXRpYWxpemVVc2VyU3R5bGUoKSBzaG91bGQgbm90IGFkZCBjb25zb2xlIGxvZ2dp bmcgaWYgdGhlcmUgYXJlIG5vIGluamVjdGVkIHVzZXIgc3R5bGUgc2hlZXRzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk1NDgKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzYwODUxNzQ1PgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy LgorCisgICAgICAgIExvZ2dpbmcgd2hlbiB0aGVyZSBhcmUgbm8gaW5qZWN0ZWQgdXNlciBzdHls ZSBzaGVldHMgaXMgdW5uZWNlc3NhcnkgYW5kIGNvbmZ1c2luZy4KKworICAgICAgICAqIHN0eWxl L1N0eWxlU2NvcGVSdWxlU2V0cy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZTo6U2NvcGVS dWxlU2V0czo6aW5pdGlhbGl6ZVVzZXJTdHlsZSk6CisKIDIwMjAtMDMtMjQgIEFudG9pbmUgUXVp bnQgIDxncmFvdXRzQGFwcGxlLmNvbT4KIAogICAgICAgICBbV2ViIEFuaW1hdGlvbnNdIENsZWFu IHRpbWVsaW5lIGhlYWRlcnMgdXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL1N0 eWxlU2NvcGVSdWxlU2V0cy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVNjb3BlUnVs ZVNldHMuY3BwCmluZGV4IGYzMjcwZDE1YTFhOGRjNTFmMGUwYWNiMDRjZjJiNGMzOTQ0ZmE3YzIu LjI5NWRmNDA0MTA3YWRjMGIzZjdiZmQ5ZTM5YjAzZDA0YjljMDRlNjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL1N0eWxlU2NvcGVSdWxlU2V0cy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvc3R5bGUvU3R5bGVTY29wZVJ1bGVTZXRzLmNwcApAQCAtOTIsNyArOTIsNyBAQCB2b2lk IFNjb3BlUnVsZVNldHM6OmluaXRpYWxpemVVc2VyU3R5bGUoKQogICAgIGlmIChDU1NTdHlsZVNo ZWV0KiBwYWdlVXNlclNoZWV0ID0gZXh0ZW5zaW9uU3R5bGVTaGVldHMucGFnZVVzZXJTaGVldCgp KQogICAgICAgICB0ZW1wVXNlclN0eWxlLT5hZGRSdWxlc0Zyb21TaGVldChwYWdlVXNlclNoZWV0 LT5jb250ZW50cygpLCBudWxscHRyLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yLCBtX3N0eWxlUmVzb2x2 ZXIpOwogICAgIGF1dG8qIHBhZ2UgPSBtX3N0eWxlUmVzb2x2ZXIuZG9jdW1lbnQoKS5wYWdlKCk7 Ci0gICAgaWYgKHBhZ2UgJiYgcGFnZS0+bWFpbkZyYW1lKCkubG9hZGVyKCkuY2xpZW50KCkuaGFz TmF2aWdhdGVkQXdheUZyb21BcHBCb3VuZERvbWFpbigpKQorICAgIGlmIChwYWdlICYmIHBhZ2Ut Pm1haW5GcmFtZSgpLmxvYWRlcigpLmNsaWVudCgpLmhhc05hdmlnYXRlZEF3YXlGcm9tQXBwQm91 bmREb21haW4oKSAmJiAhZXh0ZW5zaW9uU3R5bGVTaGVldHMuaW5qZWN0ZWRVc2VyU3R5bGVTaGVl dHMoKS5pc0VtcHR5KCkpCiAgICAgICAgIG1fc3R5bGVSZXNvbHZlci5kb2N1bWVudCgpLmFkZENv bnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OlNlY3VyaXR5LCBNZXNzYWdlTGV2ZWw6Oldhcm5p bmcsICJJZ25vcmluZyB1c2VyIHN0eWxlIHNoZWV0IGZvciBub24tYXBwIGJvdW5kIGRvbWFpbi4i X3MpOwogICAgIGVsc2UKICAgICAgICAgY29sbGVjdFJ1bGVzRnJvbVVzZXJTdHlsZVNoZWV0cyhl eHRlbnNpb25TdHlsZVNoZWV0cy5pbmplY3RlZFVzZXJTdHlsZVNoZWV0cygpLCB0ZW1wVXNlclN0 eWxlLmdldCgpLCBtZWRpYVF1ZXJ5RXZhbHVhdG9yKTsK