192724 2018-12-14 16:25:35 -0800 Web Inspector: Avoid creating and evaluating in the InspectorOverlay page on iOS as it is unused 2018-12-14 20:30:50 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue ews-watchlist hi inspector-bugzilla-changes joepeck simon.fraser webkit-bug-importer oldest_to_newest 1488099 0 joepeck 2018-12-14 16:25:35 -0800 Avoid creating and evaluating in the InspectorOverlay page on iOS as it is unused Noticed this when enabling rulers, which don't show on iOS, but I saw lots of time spent updating rulers in JavaScript profiling. 1488101 1 webkit-bug-importer 2018-12-14 16:26:34 -0800 <rdar://problem/46745911> 1488102 2 357354 joepeck 2018-12-14 16:28:27 -0800 Created attachment 357354 [PATCH] Proposed Fix 1488104 3 357354 hi 2018-12-14 16:36:43 -0800 Comment on attachment 357354 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=357354&action=review rs=me, good catch! > Source/WebCore/inspector/InspectorOverlay.cpp:183 > + Page* overlayPage = this->overlayPage(); Is this actually reachable on iOS? I'd expect `InspectorOverlay::paint` (which is called from `InspectorController::drawHighlight`, which is called from `WebInspectorClient::drawRect`) to not happen on iOS, since it doesn't actually involve creating a `PageOverlay`? 1488218 4 joepeck 2018-12-14 20:04:12 -0800 (In reply to Devin Rousso from comment #3) > Comment on attachment 357354 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=357354&action=review > > rs=me, good catch! > > > Source/WebCore/inspector/InspectorOverlay.cpp:183 > > + Page* overlayPage = this->overlayPage(); > > Is this actually reachable on iOS? I'd expect `InspectorOverlay::paint` > (which is called from `InspectorController::drawHighlight`, which is called > from `WebInspectorClient::drawRect`) to not happen on iOS, since it doesn't > actually involve creating a `PageOverlay`? I don't think it is but I just want this code to be safe. 1488221 5 357354 commit-queue 2018-12-14 20:30:48 -0800 Comment on attachment 357354 [PATCH] Proposed Fix Clearing flags on attachment: 357354 Committed r239247: <https://trac.webkit.org/changeset/239247> 1488222 6 commit-queue 2018-12-14 20:30:50 -0800 All reviewed patches have been landed. Closing bug. 357354 2018-12-14 16:28:27 -0800 2018-12-14 20:30:48 -0800 [PATCH] Proposed Fix overlay-1.patch text/plain 3811 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NTRlZTMzYjQxZS4uNjFkZDhiNDhiMTMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOC0xMi0xNCAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEF2b2lkIGNyZWF0aW5nIGFuZCBldmFsdWF0 aW5nIGluIHRoZSBJbnNwZWN0b3JPdmVybGF5IHBhZ2Ugb24gaU9TIGFzIGl0IGlzIHVudXNlZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkyNzI0Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS80Njc0NTkxMT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBpT1MgbmV2ZXIgaW5zdGFsbHMgdGhlIEluc3BlY3Rv ck92ZXJsYXkgcGFnZSBhcyBhIHBhZ2Ugb3ZlcmxheS4KKyAgICAgICAgSXQgYWxzbyB1c2VzIGl0 cyBvd24gbm9kZSBoaWdobGlnaHRpbmcgcGFpbnRpbmcuIEF2b2lkIGFueSB3b3JrCisgICAgICAg IGFuZCByZXNvdXJjZXMgYXNzb2NpYXRlZCB3aXRoIHRoZSBvdmVybGF5IHBhZ2UgZm9yIGlPUy4K KworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JPdmVybGF5LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Okluc3BlY3Rvck92ZXJsYXk6OnBhaW50KToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3Rvck92ZXJsYXk6OnVwZGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JPdmVybGF5 OjpvdmVybGF5UGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpldmFsdWF0ZUNvbW1hbmRJbk92ZXJs YXkpOgorCiAyMDE4LTEyLTE0ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29t PgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIyMzMyNjgpOiBjb250ZW50cyBvZiBhbiBhbmltYXRl ZCBlbGVtZW50IGluc2lkZSBvdmVyZmxvdzpoaWRkZW4gZGlzYXBwZWFyCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yT3ZlcmxheS5jcHAKaW5kZXggMDUzZGFkOGFlNDcuLjNl M2JjODE2ZWE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y T3ZlcmxheS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck92ZXJs YXkuY3BwCkBAIC0xODAsOCArMTgwLDEyIEBAIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6cGFpbnQo R3JhcGhpY3NDb250ZXh0JiBjb250ZXh0KQogICAgIGlmICghc2hvdWxkU2hvd092ZXJsYXkoKSkK ICAgICAgICAgcmV0dXJuOwogCisgICAgUGFnZSogb3ZlcmxheVBhZ2UgPSB0aGlzLT5vdmVybGF5 UGFnZSgpOworICAgIGlmICghb3ZlcmxheVBhZ2UpCisgICAgICAgIHJldHVybjsKKwogICAgIEdy YXBoaWNzQ29udGV4dFN0YXRlU2F2ZXIgc3RhdGVTYXZlcihjb250ZXh0KTsKLSAgICBGcmFtZVZp ZXcqIHZpZXcgPSBvdmVybGF5UGFnZSgpLT5tYWluRnJhbWUoKS52aWV3KCk7CisgICAgRnJhbWVW aWV3KiB2aWV3ID0gb3ZlcmxheVBhZ2UtPm1haW5GcmFtZSgpLnZpZXcoKTsKIAogI2lmIFBMQVRG T1JNKE1BQykKICAgICBMb2NhbERlZmF1bHRTeXN0ZW1BcHBlYXJhbmNlIGxvY2FsQXBwZWFyYW5j ZSh2aWV3LT51c2VEYXJrQXBwZWFyYW5jZSgpKTsKQEAgLTI5MCw5ICsyOTQsMTIgQEAgdm9pZCBJ bnNwZWN0b3JPdmVybGF5Ojp1cGRhdGUoKQogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJu OwogCi0gICAgRnJhbWVWaWV3KiBvdmVybGF5VmlldyA9IG92ZXJsYXlQYWdlKCktPm1haW5GcmFt ZSgpLnZpZXcoKTsKLSAgICBJbnRTaXplIGZyYW1lVmlld0Z1bGxTaXplID0gdmlldy0+c2l6ZUZv clZpc2libGVDb250ZW50KFNjcm9sbGFibGVBcmVhOjpJbmNsdWRlU2Nyb2xsYmFycyk7Ci0gICAg b3ZlcmxheVZpZXctPnJlc2l6ZShmcmFtZVZpZXdGdWxsU2l6ZSk7CisgICAgUGFnZSogb3Zlcmxh eVBhZ2UgPSB0aGlzLT5vdmVybGF5UGFnZSgpOworICAgIGlmIChvdmVybGF5UGFnZSkgeworICAg ICAgICBGcmFtZVZpZXcqIG92ZXJsYXlWaWV3ID0gb3ZlcmxheVBhZ2UtPm1haW5GcmFtZSgpLnZp ZXcoKTsKKyAgICAgICAgSW50U2l6ZSBmcmFtZVZpZXdGdWxsU2l6ZSA9IHZpZXctPnNpemVGb3JW aXNpYmxlQ29udGVudChTY3JvbGxhYmxlQXJlYTo6SW5jbHVkZVNjcm9sbGJhcnMpOworICAgICAg ICBvdmVybGF5Vmlldy0+cmVzaXplKGZyYW1lVmlld0Z1bGxTaXplKTsKKyAgICB9CiAKICAgICAv LyBDbGVhciBjYW52YXMgYW5kIHBhaW50IHRoaW5ncy4KICAgICBJbnRTaXplIHZpZXdwb3J0U2l6 ZSA9IHZpZXctPnNpemVGb3JWaXNpYmxlQ29udGVudCgpOwpAQCAtMzA5LDkgKzMxNiwxMiBAQCB2 b2lkIEluc3BlY3Rvck92ZXJsYXk6OnVwZGF0ZSgpCiAgICAgICAgIGRyYXdSdWxlcnMoKTsKIAog ICAgIC8vIFBvc2l0aW9uIERPTSBlbGVtZW50cy4KLSAgICBvdmVybGF5UGFnZSgpLT5tYWluRnJh bWUoKS5kb2N1bWVudCgpLT5yZXNvbHZlU3R5bGUoRG9jdW1lbnQ6OlJlc29sdmVTdHlsZVR5cGU6 OlJlYnVpbGQpOwotICAgIGlmIChvdmVybGF5Vmlldy0+bmVlZHNMYXlvdXQoKSkKLSAgICAgICAg b3ZlcmxheVZpZXctPmxheW91dENvbnRleHQoKS5sYXlvdXQoKTsKKyAgICBpZiAob3ZlcmxheVBh Z2UpIHsKKyAgICAgICAgb3ZlcmxheVBhZ2UtPm1haW5GcmFtZSgpLmRvY3VtZW50KCktPnJlc29s dmVTdHlsZShEb2N1bWVudDo6UmVzb2x2ZVN0eWxlVHlwZTo6UmVidWlsZCk7CisgICAgICAgIEZy YW1lVmlldyogb3ZlcmxheVZpZXcgPSBvdmVybGF5UGFnZS0+bWFpbkZyYW1lKCkudmlldygpOwor ICAgICAgICBpZiAob3ZlcmxheVZpZXctPm5lZWRzTGF5b3V0KCkpCisgICAgICAgICAgICBvdmVy bGF5Vmlldy0+bGF5b3V0Q29udGV4dCgpLmxheW91dCgpOworICAgIH0KIAogICAgIGZvcmNlUGFp bnQoKTsKIH0KQEAgLTcwMiw2ICs3MTIsOSBAQCB2b2lkIEluc3BlY3Rvck92ZXJsYXk6OmRyYXdQ YXVzZWRJbkRlYnVnZ2VyTWVzc2FnZSgpCiAKIFBhZ2UqIEluc3BlY3Rvck92ZXJsYXk6Om92ZXJs YXlQYWdlKCkKIHsKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIHJldHVybiBudWxscHRy OworI2Vsc2UKICAgICBpZiAobV9vdmVybGF5UGFnZSkKICAgICAgICAgcmV0dXJuIG1fb3Zlcmxh eVBhZ2UuZ2V0KCk7CiAKQEAgLTc0Niw2ICs3NTksNyBAQCBQYWdlKiBJbnNwZWN0b3JPdmVybGF5 OjpvdmVybGF5UGFnZSgpCiAjZW5kaWYKIAogICAgIHJldHVybiBtX292ZXJsYXlQYWdlLmdldCgp OworI2VuZGlmCiB9CiAKIHZvaWQgSW5zcGVjdG9yT3ZlcmxheTo6Zm9yY2VQYWludCgpCkBAIC03 NzAsNiArNzg0LDkgQEAgdm9pZCBJbnNwZWN0b3JPdmVybGF5OjpyZXNldChjb25zdCBJbnRTaXpl JiB2aWV3cG9ydFNpemUsIGNvbnN0IEludFBvaW50JiBzY3JvbGwKIAogc3RhdGljIHZvaWQgZXZh bHVhdGVDb21tYW5kSW5PdmVybGF5KFBhZ2UqIHBhZ2UsIFJlZjxKU09OOjpBcnJheT4mJiBjb21t YW5kKQogeworICAgIGlmICghcGFnZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgcGFnZS0+bWFp bkZyYW1lKCkuc2NyaXB0KCkuZXZhbHVhdGUoU2NyaXB0U291cmNlQ29kZShtYWtlU3RyaW5nKCJk aXNwYXRjaCgiLCBjb21tYW5kLT50b0pTT05TdHJpbmcoKSwgJyknKSkpOwogfQogCg==