140632 2015-01-19 12:03:24 -0800 [iOS][WK2] Redraw find-in-page indicator on rotation 2015-01-20 14:21:22 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mhock mhock benjamin thorton oldest_to_newest 1062444 0 mhock 2015-01-19 12:03:24 -0800 Redraw find-in-page indicator on rotation 1062450 1 244915 mhock 2015-01-19 12:11:04 -0800 Created attachment 244915 patch 1062863 2 244915 thorton 2015-01-20 13:44:05 -0800 Comment on attachment 244915 patch View in context: https://bugs.webkit.org/attachment.cgi?id=244915&action=review > Source/WebKit2/WebProcess/WebPage/FindController.cpp:374 > + if (m_isShowingFindIndicator) { this should be an early return. > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3481 > + m_findController.redraw(); Might this be helpful on Mac too? Does it do the right thing there? (I'm guessing not, so this is probably best for now) > Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm:99 > + m_webPage->zoomToRect(matchRect, m_webPage->minimumPageScaleFactor(), std::min(m_webPage->maximumPageScaleFactor(), maximumFindIndicatorZoom)); Why this change? If the highlighted text moves out of view after a layout, wouldn't we want to zoom to it? 1062868 3 mhock 2015-01-20 13:54:07 -0800 (In reply to comment #2) > > Source/WebKit2/WebProcess/WebPage/FindController.cpp:374 > > + if (m_isShowingFindIndicator) { > > this should be an early return. Will do. > > Source/WebKit2/WebProcess/WebPage/WebPage.cpp:3481 > > + m_findController.redraw(); > > Might this be helpful on Mac too? Does it do the right thing there? (I'm > guessing not, so this is probably best for now) The changes don't seem to be necessary on Mac. > > Source/WebKit2/WebProcess/WebPage/ios/FindControllerIOS.mm:99 > > + m_webPage->zoomToRect(matchRect, m_webPage->minimumPageScaleFactor(), std::min(m_webPage->maximumPageScaleFactor(), maximumFindIndicatorZoom)); > > Why this change? If the highlighted text moves out of view after a layout, > wouldn't we want to zoom to it? I don't think we'd like the view to move constantly if text is animated. Furthermore, the user panning could trigger this code and we wouldn't like that to move the view around, either. 1062878 4 mhock 2015-01-20 14:21:22 -0800 Committed r178755: <http://trac.webkit.org/changeset/178755> 244915 2015-01-19 12:11:04 -0800 2015-01-20 13:44:05 -0800 patch findredraw.01.diff text/plain 3507 mhock ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBhYjRkNTZhLi5lNjUxYTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTUtMDEtMTkgIE1hcnRpbiBIb2NrICA8bWhvY2tAYXBwbGUuY29tPgorCisgICAgICAg IFtpT1NdW1dLMl0gUmVkcmF3IGZpbmQtaW4tcGFnZSBpbmRpY2F0b3Igb24gcm90YXRpb24KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDYzMgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMTg4NTgzOTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6cmVkcmF3KTogQWRkIG1l dGhvZCB0byByZWRyYXcgZmluZCBpbmRpY2F0b3IgKG9ubHkgdXNlZCBieSBpT1MpLgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bWFp bkZyYW1lRGlkTGF5b3V0KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRD b250cm9sbGVySU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6dXBkYXRl RmluZEluZGljYXRvcik6IFJlZHJhdyBzaG91bGQgbm90IHRyaWdnZXIgem9vbS4KKwogMjAxNS0w MS0xOSAgTXlsZXMgQy4gTWF4ZmllbGQgIDxtbWF4ZmllbGRAYXBwbGUuY29tPgogCiAgICAgICAg IFtTVkcgLT4gT1RGIENvbnZlcnRlcl0gRmxpcCB0aGUgc3dpdGNoIG9uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNwcAppbmRleCAy Y2Q3YTM3Li43MjdlMmM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YlBhZ2UvRmluZENvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHAKQEAgLTM2OSw2ICszNjksMTcgQEAgdm9pZCBGaW5k Q29udHJvbGxlcjo6ZGV2aWNlU2NhbGVGYWN0b3JEaWRDaGFuZ2UoKQogICAgIHVwZGF0ZUZpbmRJ bmRpY2F0b3IoKnNlbGVjdGVkRnJhbWUsIHRydWUsIGZhbHNlKTsKIH0KIAordm9pZCBGaW5kQ29u dHJvbGxlcjo6cmVkcmF3KCkKK3sKKyAgICBpZiAobV9pc1Nob3dpbmdGaW5kSW5kaWNhdG9yKSB7 CisgICAgICAgIEZyYW1lKiBzZWxlY3RlZEZyYW1lID0gZnJhbWVXaXRoU2VsZWN0aW9uKG1fd2Vi UGFnZS0+Y29yZVBhZ2UoKSk7CisgICAgICAgIGlmICghc2VsZWN0ZWRGcmFtZSkKKyAgICAgICAg ICAgIHJldHVybjsKKworICAgICAgICB1cGRhdGVGaW5kSW5kaWNhdG9yKCpzZWxlY3RlZEZyYW1l LCBpc1Nob3dpbmdPdmVybGF5KCksIGZhbHNlKTsKKyAgICB9Cit9CisKIFZlY3RvcjxJbnRSZWN0 PiBGaW5kQ29udHJvbGxlcjo6cmVjdHNGb3JUZXh0TWF0Y2hlcygpCiB7CiAgICAgVmVjdG9yPElu dFJlY3Q+IHJlY3RzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0ZpbmRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuaAppbmRleCAzZDU2NzdkLi4yMWI0Yzc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaApAQCAtNjgsNiAr NjgsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGRldmljZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKCk7 CiAKKyAgICB2b2lkIHJlZHJhdygpOworCiBwcml2YXRlOgogICAgIC8vIFBhZ2VPdmVybGF5OjpD bGllbnQuCiAgICAgdmlydHVhbCB2b2lkIHBhZ2VPdmVybGF5RGVzdHJveWVkKFdlYkNvcmU6OlBh Z2VPdmVybGF5Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKaW5kZXggZGU0OTEwZC4uYjEwMGFkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMzQ3OCw2ICszNDc4LDcgQEAgdm9pZCBXZWJQ YWdlOjptYWluRnJhbWVEaWRMYXlvdXQoKQogICAgICAgICAgICAgdmlld3BvcnRDb25maWd1cmF0 aW9uQ2hhbmdlZCgpOwogICAgICAgICB9CiAgICAgfQorICAgIG1fZmluZENvbnRyb2xsZXIucmVk cmF3KCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KaW5kZXggNjhjOWU3YS4uM2E5 MTFiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9G aW5kQ29udHJvbGxlcklPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvaW9zL0ZpbmRDb250cm9sbGVySU9TLm1tCkBAIC05NSw3ICs5NSw5IEBAIGJvb2wgRmluZENv bnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IoRnJhbWUmIHNlbGVjdGVkRnJhbWUsIGJvb2wg aXNTaG93aW5nT3ZlCiAgICAgbV9maW5kSW5kaWNhdG9yT3ZlcmxheS0+c2V0RnJhbWUobWF0Y2hS ZWN0KTsKICAgICBtX2ZpbmRJbmRpY2F0b3JPdmVybGF5LT5zZXROZWVkc0Rpc3BsYXkoKTsKIAot ICAgIG1fd2ViUGFnZS0+em9vbVRvUmVjdChtYXRjaFJlY3QsIG1fd2ViUGFnZS0+bWluaW11bVBh Z2VTY2FsZUZhY3RvcigpLCBzdGQ6Om1pbihtX3dlYlBhZ2UtPm1heGltdW1QYWdlU2NhbGVGYWN0 b3IoKSwgbWF4aW11bUZpbmRJbmRpY2F0b3Jab29tKSk7CisgICAgaWYgKGlzU2hvd2luZ092ZXJs YXkgfHwgc2hvdWxkQW5pbWF0ZSkKKyAgICAgICAgbV93ZWJQYWdlLT56b29tVG9SZWN0KG1hdGNo UmVjdCwgbV93ZWJQYWdlLT5taW5pbXVtUGFnZVNjYWxlRmFjdG9yKCksIHN0ZDo6bWluKG1fd2Vi UGFnZS0+bWF4aW11bVBhZ2VTY2FsZUZhY3RvcigpLCBtYXhpbXVtRmluZEluZGljYXRvclpvb20p KTsKKwogICAgIG1fZmluZEluZGljYXRvclJlY3QgPSBtYXRjaFJlY3Q7CiAgICAgbV9pc1Nob3dp bmdGaW5kSW5kaWNhdG9yID0gdHJ1ZTsKICAgICAK