99485 2012-10-16 11:30:17 -0700 [EFL][WK2][AC] Url bar should not be covered by the web view 2012-10-16 18:42:15 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 yael webkit-unassigned gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi ostap73 rakuco webkit.review.bot oldest_to_newest 743345 0 yael 2012-10-16 11:30:17 -0700 When accelerated compositing is in use, the web view and its surface are not positioned correctly. A patch is coming. 743397 1 168992 yael 2012-10-16 12:08:35 -0700 Created attachment 168992 Patch 743477 2 168992 ostap73 2012-10-16 13:27:52 -0700 Comment on attachment 168992 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=168992&action=review > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:688 > + needsNewSurface = priv->evasGlSurface; Here flag is set under USE(COORDINATED_GRAPHICS) condition. > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:707 > + if (needsNewSurface) { And here it is used under USE(ACCELERATED_COMPOSITING) . I would move assignment out of USE(COORDINATED_GRAPHICS) at least. 743481 3 yael 2012-10-16 13:30:56 -0700 (In reply to comment #2) > (From update of attachment 168992 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=168992&action=review > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:688 > > + needsNewSurface = priv->evasGlSurface; > > Here flag is set under USE(COORDINATED_GRAPHICS) condition. > > > Source/WebKit2/UIProcess/API/efl/ewk_view.cpp:707 > > + if (needsNewSurface) { > > And here it is used under USE(ACCELERATED_COMPOSITING) . > I would move assignment out of USE(COORDINATED_GRAPHICS) at least. I kept the flags as they are now. IMO, we should stick to one flag throughout the code, but I don't think that cleaning out the flags should be part of this patch. 743535 4 yael 2012-10-16 14:03:35 -0700 Created https://bugs.webkit.org/show_bug.cgi?id=99503 to fix the flags. 743549 5 169025 yael 2012-10-16 14:15:16 -0700 Created attachment 169025 Patch Update based on comment #2. 743765 6 169025 laszlo.gombos 2012-10-16 18:26:01 -0700 Comment on attachment 169025 Patch LGTM, r=me. 743776 7 169025 webkit.review.bot 2012-10-16 18:42:10 -0700 Comment on attachment 169025 Patch Clearing flags on attachment: 169025 Committed r131543: <http://trac.webkit.org/changeset/131543> 743777 8 webkit.review.bot 2012-10-16 18:42:15 -0700 All reviewed patches have been landed. Closing bug. 168992 2012-10-16 12:08:35 -0700 2012-10-16 14:15:16 -0700 Patch 99485.patch text/plain 5799 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTQ3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEwLTE2ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdW0FDXSBV cmwgYmFyIHNob3VsZCBub3QgYmUgY292ZXJlZCBieSB0aGUgd2ViIHZpZXcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NDg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhY2NlbGVyYXRlZCBjb21w b3NpdGluZyBpcyBlbmFibGVkLCB0aGUgdXJsIGJhciBpcyBjb3ZlcmVkIGJ5IHRoZSB3ZWIgdmll dy4KKyAgICAgICAgVGhpcyB3YXMgY2F1c2VkIGJ5IDIgaXNzdWVzOgorICAgICAgICAtIF9ld2tf dmlld19zbWFydF9jYWxjdWxhdGUgd2FzIGNhbGxlZCBiZWZvcmUgdGhlIGZpcnN0IGdsIHN1cmZh Y2Ugd2FzIGNyZWF0ZWQsCisgICAgICAgICAgc28gYW4gZWFybHkgcmV0dXJuIGNhdXNlZCBpdCB0 byBub3Qgc2F2ZSB0aGUgbmV3IHZpZXcgcG9zaXRpb24uCisgICAgICAgIC0gV2hlbiBwYWludGlu ZyB0aGUgdmlldywgd2UgbmVlZCB0byB0YWtlIGludG8gYWNjb3VudCB0aGUgcG9zaXRpb24gb2YK KyAgICAgICAgICB0aGUgdmlldyB3aXRoaW4gdGhlIHdpbmRvdywgaS5lLiB0aGUgdXJsIGJhci4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkVmbFZpZXdwb3J0SGFuZGxlcjo6ZGlzcGxheSk6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmg6CisgICAgICAgIChFZmxWaWV3 cG9ydEhhbmRsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19zbWFydF9jYWxjdWxhdGUpOgorICAgICAgICAoZXdrX3ZpZXdf ZGlzcGxheSk6CisKIDIwMTItMTAtMTYgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJhcGhhZWwu a3Viby5kYS5jb3N0YUBpbnRlbC5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHRlc3RSdW5uZXIu ZHVtcFNlbGVjdGlvblJlY3QoKSBpbiBXZWJLaXRUZXN0UnVubmVyCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5j cHAJKHJldmlzaW9uIDEzMTM5MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0VmbFZpZXdwb3J0SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDE1ICs1OCwxNyBA QCB2b2lkIEVmbFZpZXdwb3J0SGFuZGxlcjo6c2V0UmVuZGVyZXJBY3RpCiAgICAgZHJhd2luZ0Fy ZWEoKS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJlcigpLT5z ZXRBY3RpdmUoYWN0aXZlKTsKIH0KIAotdm9pZCBFZmxWaWV3cG9ydEhhbmRsZXI6OmRpc3BsYXko Y29uc3QgSW50UmVjdCYgcmVjdCkKK3ZvaWQgRWZsVmlld3BvcnRIYW5kbGVyOjpkaXNwbGF5KGNv bnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFBvaW50JiB2aWV3UG9zaXRpb24pCiB7CiAgICAg V2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXggbWF0cml4OwotICAgIG1hdHJpeC5zZXRNYXRy aXgobV9zY2FsZUZhY3RvciwgMCwgMCwgbV9zY2FsZUZhY3RvciwgLW1fdmlzaWJsZUNvbnRlbnRS ZWN0LngoKSwgLW1fdmlzaWJsZUNvbnRlbnRSZWN0LnkoKSk7CisgICAgbWF0cml4LnNldE1hdHJp eChtX3NjYWxlRmFjdG9yLCAwLCAwLCBtX3NjYWxlRmFjdG9yLCAtbV92aXNpYmxlQ29udGVudFJl Y3QueCgpICsgdmlld1Bvc2l0aW9uLngoKSwgLW1fdmlzaWJsZUNvbnRlbnRSZWN0LnkoKSArIHZp ZXdQb3NpdGlvbi55KCkpOwogCiAgICAgTGF5ZXJUcmVlUmVuZGVyZXIqIHJlbmRlcmVyID0gZHJh d2luZ0FyZWEoKS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJl cigpOwogICAgIHJlbmRlcmVyLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAgcmVuZGVyZXItPnN5bmNS ZW1vdGVDb250ZW50KCk7Ci0gICAgcmVuZGVyZXItPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KG1h dHJpeCwgMSwgcmVjdCk7CisgICAgSW50UmVjdCBjbGlwUmVjdChyZWN0KTsKKyAgICBjbGlwUmVj dC5tb3ZlKHZpZXdQb3NpdGlvbi54KCksIHZpZXdQb3NpdGlvbi55KCkpOworICAgIHJlbmRlcmVy LT5wYWludFRvQ3VycmVudEdMQ29udGV4dChtYXRyaXgsIDEsIGNsaXBSZWN0KTsKIH0KIAogdm9p ZCBFZmxWaWV3cG9ydEhhbmRsZXI6OnVwZGF0ZVZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB2 aWV3cG9ydFNpemUpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxW aWV3cG9ydEhhbmRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuaAkocmV2aXNpb24gMTMxMzkxKQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogICAgIERyYXdpbmdBcmVhUHJveHkqIGRy YXdpbmdBcmVhKCkgY29uc3Q7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIHsgcmV0 dXJuIG1fdmlld3BvcnRTaXplOyB9CiAKLSAgICB2b2lkIGRpc3BsYXkoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgcmVjdCk7CisgICAgdm9pZCBkaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IHJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiB2aWV3UG9zaXRpb24pOwogICAgIHZvaWQg dXBkYXRlVmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdwb3J0U2l6ZSk7 CiAgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JiwgZmxvYXQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsKICAgICB2b2lkIGRpZENoYW5n ZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDEz MTM5MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjc2LDYgKzY3Niw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19z bWFydF9jYWxjdWxhdGUoRXYKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IHNtYXJ0RGF0YSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdik7CiAgICAgRXZhc19Db29yZCB4LCB5LCB3aWR0aCwgaGVpZ2h0OworICAgIGJvb2wgbmVl ZHNOZXdTdXJmYWNlID0gZmFsc2U7CiAKICAgICBzbWFydERhdGEtPmNoYW5nZWQuYW55ID0gZmFs c2U7CiAKQEAgLTY4NCwyMCArNjg1LDEyIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9j YWxjdWxhdGUoRXYKICAgICBpZiAoc21hcnREYXRhLT5jaGFuZ2VkLnNpemUpIHsKICNpZiBVU0Uo Q09PUkRJTkFURURfR1JBUEhJQ1MpCiAgICAgICAgIHByaXYtPnZpZXdwb3J0SGFuZGxlci0+dXBk YXRlVmlld3BvcnRTaXplKEludFNpemUod2lkdGgsIGhlaWdodCkpOworICAgICAgICBuZWVkc05l d1N1cmZhY2UgPSBwcml2LT5ldmFzR2xTdXJmYWNlOwogI2VuZGlmCiAKICAgICAgICAgaWYgKHBy aXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkKICAgICAgICAgICAgIHByaXYtPnBhZ2VQcm94 eS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZShJbnRTaXplKHdpZHRoLCBoZWlnaHQpLCBJbnRTaXpl KCkpOwogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBpZiAoIXBy aXYtPmV2YXNHbFN1cmZhY2UpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGV2YXNfZ2xf c3VyZmFjZV9kZXN0cm95KHByaXYtPmV2YXNHbCwgcHJpdi0+ZXZhc0dsU3VyZmFjZSk7Ci0gICAg ICAgIHByaXYtPmV2YXNHbFN1cmZhY2UgPSAwOwotICAgICAgICBld2tfdmlld19jcmVhdGVfZ2xf c3VyZmFjZShld2tWaWV3LCBJbnRTaXplKHdpZHRoLCBoZWlnaHQpKTsKLSAgICAgICAgZXdrX3Zp ZXdfZGlzcGxheShld2tWaWV3LCBJbnRSZWN0KEludFBvaW50KCksIEludFNpemUod2lkdGgsIGhl aWdodCkpKTsKLSNlbmRpZgotCiAgICAgICAgIHNtYXJ0RGF0YS0+dmlldy53ID0gd2lkdGg7CiAg ICAgICAgIHNtYXJ0RGF0YS0+dmlldy5oID0gaGVpZ2h0OwogICAgICAgICBzbWFydERhdGEtPmNo YW5nZWQuc2l6ZSA9IGZhbHNlOwpAQCAtNzA5LDYgKzcwMiwxNSBAQCBzdGF0aWMgdm9pZCBfZXdr X3ZpZXdfc21hcnRfY2FsY3VsYXRlKEV2CiAgICAgICAgIHNtYXJ0RGF0YS0+dmlldy55ID0geTsK ICAgICAgICAgc21hcnREYXRhLT5jaGFuZ2VkLnBvc2l0aW9uID0gZmFsc2U7CiAgICAgfQorCisj aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmIChuZWVkc05ld1N1cmZhY2Up IHsKKyAgICAgICAgZXZhc19nbF9zdXJmYWNlX2Rlc3Ryb3kocHJpdi0+ZXZhc0dsLCBwcml2LT5l dmFzR2xTdXJmYWNlKTsKKyAgICAgICAgcHJpdi0+ZXZhc0dsU3VyZmFjZSA9IDA7CisgICAgICAg IGV3a192aWV3X2NyZWF0ZV9nbF9zdXJmYWNlKGV3a1ZpZXcsIEludFNpemUod2lkdGgsIGhlaWdo dCkpOworICAgICAgICBld2tfdmlld19kaXNwbGF5KGV3a1ZpZXcsIEludFJlY3QoSW50UG9pbnQo KSwgSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSkpOworICAgIH0KKyNlbmRpZgogfQogCiBzdGF0aWMg dm9pZCBfZXdrX3ZpZXdfc21hcnRfc2hvdyhFdmFzX09iamVjdCogZXdrVmlldykKQEAgLTEzMTQs NyArMTMxNiw3IEBAIHZvaWQgZXdrX3ZpZXdfZGlzcGxheShFdmFzX09iamVjdCogZXdrVmkKICAg ICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2KTsKIAogICAgIGV2 YXNfZ2xfbWFrZV9jdXJyZW50KHByaXYtPmV2YXNHbCwgcHJpdi0+ZXZhc0dsU3VyZmFjZSwgcHJp di0+ZXZhc0dsQ29udGV4dCk7Ci0gICAgcHJpdi0+dmlld3BvcnRIYW5kbGVyLT5kaXNwbGF5KHJl Y3QpOworICAgIHByaXYtPnZpZXdwb3J0SGFuZGxlci0+ZGlzcGxheShyZWN0LCBJbnRQb2ludChz bWFydERhdGEtPnZpZXcueCwgc21hcnREYXRhLT52aWV3LnkpKTsKICNlbmRpZgogCiAgICAgZXZh c19vYmplY3RfaW1hZ2VfZGF0YV91cGRhdGVfYWRkKHNtYXJ0RGF0YS0+aW1hZ2UsIHJlY3QueCgp LCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsK 169025 2012-10-16 14:15:16 -0700 2012-10-16 18:42:10 -0700 Patch 99485.patch text/plain 5805 yael SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMTQ3OSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDEyLTEwLTE2ICBZYWVsIEFo YXJvbiAgPHlhZWwuYWhhcm9uQGludGVsLmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdW0FDXSBV cmwgYmFyIHNob3VsZCBub3QgYmUgY292ZXJlZCBieSB0aGUgd2ViIHZpZXcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5NDg1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBhY2NlbGVyYXRlZCBjb21w b3NpdGluZyBpcyBlbmFibGVkLCB0aGUgdXJsIGJhciBpcyBjb3ZlcmVkIGJ5IHRoZSB3ZWIgdmll dy4KKyAgICAgICAgVGhpcyB3YXMgY2F1c2VkIGJ5IDIgaXNzdWVzOgorICAgICAgICAtIF9ld2tf dmlld19zbWFydF9jYWxjdWxhdGUgd2FzIGNhbGxlZCBiZWZvcmUgdGhlIGZpcnN0IGdsIHN1cmZh Y2Ugd2FzIGNyZWF0ZWQsCisgICAgICAgICAgc28gYW4gZWFybHkgcmV0dXJuIGNhdXNlZCBpdCB0 byBub3Qgc2F2ZSB0aGUgbmV3IHZpZXcgcG9zaXRpb24uCisgICAgICAgIC0gV2hlbiBwYWludGlu ZyB0aGUgdmlldywgd2UgbmVlZCB0byB0YWtlIGludG8gYWNjb3VudCB0aGUgcG9zaXRpb24gb2YK KyAgICAgICAgICB0aGUgdmlldyB3aXRoaW4gdGhlIHdpbmRvdywgaS5lLiB0aGUgdXJsIGJhci4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OkVmbFZpZXdwb3J0SGFuZGxlcjo6ZGlzcGxheSk6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmg6CisgICAgICAgIChFZmxWaWV3 cG9ydEhhbmRsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19zbWFydF9jYWxjdWxhdGUpOgorICAgICAgICAoZXdrX3ZpZXdf ZGlzcGxheSk6CisKIDIwMTItMTAtMTYgIFJhcGhhZWwgS3VibyBkYSBDb3N0YSAgPHJhcGhhZWwu a3Viby5kYS5jb3N0YUBpbnRlbC5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IHRlc3RSdW5uZXIu ZHVtcFNlbGVjdGlvblJlY3QoKSBpbiBXZWJLaXRUZXN0UnVubmVyCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5j cHAJKHJldmlzaW9uIDEzMTM5MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0VmbFZpZXdwb3J0SGFuZGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4LDE1ICs1OCwxNyBA QCB2b2lkIEVmbFZpZXdwb3J0SGFuZGxlcjo6c2V0UmVuZGVyZXJBY3RpCiAgICAgZHJhd2luZ0Fy ZWEoKS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJlcigpLT5z ZXRBY3RpdmUoYWN0aXZlKTsKIH0KIAotdm9pZCBFZmxWaWV3cG9ydEhhbmRsZXI6OmRpc3BsYXko Y29uc3QgSW50UmVjdCYgcmVjdCkKK3ZvaWQgRWZsVmlld3BvcnRIYW5kbGVyOjpkaXNwbGF5KGNv bnN0IEludFJlY3QmIHJlY3QsIGNvbnN0IEludFBvaW50JiB2aWV3UG9zaXRpb24pCiB7CiAgICAg V2ViQ29yZTo6VHJhbnNmb3JtYXRpb25NYXRyaXggbWF0cml4OwotICAgIG1hdHJpeC5zZXRNYXRy aXgobV9zY2FsZUZhY3RvciwgMCwgMCwgbV9zY2FsZUZhY3RvciwgLW1fdmlzaWJsZUNvbnRlbnRS ZWN0LngoKSwgLW1fdmlzaWJsZUNvbnRlbnRSZWN0LnkoKSk7CisgICAgbWF0cml4LnNldE1hdHJp eChtX3NjYWxlRmFjdG9yLCAwLCAwLCBtX3NjYWxlRmFjdG9yLCAtbV92aXNpYmxlQ29udGVudFJl Y3QueCgpICsgdmlld1Bvc2l0aW9uLngoKSwgLW1fdmlzaWJsZUNvbnRlbnRSZWN0LnkoKSArIHZp ZXdQb3NpdGlvbi55KCkpOwogCiAgICAgTGF5ZXJUcmVlUmVuZGVyZXIqIHJlbmRlcmVyID0gZHJh d2luZ0FyZWEoKS0+bGF5ZXJUcmVlQ29vcmRpbmF0b3JQcm94eSgpLT5sYXllclRyZWVSZW5kZXJl cigpOwogICAgIHJlbmRlcmVyLT5zZXRBY3RpdmUodHJ1ZSk7CiAgICAgcmVuZGVyZXItPnN5bmNS ZW1vdGVDb250ZW50KCk7Ci0gICAgcmVuZGVyZXItPnBhaW50VG9DdXJyZW50R0xDb250ZXh0KG1h dHJpeCwgMSwgcmVjdCk7CisgICAgSW50UmVjdCBjbGlwUmVjdChyZWN0KTsKKyAgICBjbGlwUmVj dC5tb3ZlKHZpZXdQb3NpdGlvbi54KCksIHZpZXdQb3NpdGlvbi55KCkpOworICAgIHJlbmRlcmVy LT5wYWludFRvQ3VycmVudEdMQ29udGV4dChtYXRyaXgsIDEsIGNsaXBSZWN0KTsKIH0KIAogdm9p ZCBFZmxWaWV3cG9ydEhhbmRsZXI6OnVwZGF0ZVZpZXdwb3J0U2l6ZShjb25zdCBJbnRTaXplJiB2 aWV3cG9ydFNpemUpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxW aWV3cG9ydEhhbmRsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuaAkocmV2aXNpb24gMTMxMzkxKQorKysgU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmgJKHdvcmtpbmcg Y29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgcHVibGljOgogICAgIERyYXdpbmdBcmVhUHJveHkqIGRy YXdpbmdBcmVhKCkgY29uc3Q7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIHsgcmV0 dXJuIG1fdmlld3BvcnRTaXplOyB9CiAKLSAgICB2b2lkIGRpc3BsYXkoY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYgcmVjdCk7CisgICAgdm9pZCBkaXNwbGF5KGNvbnN0IFdlYkNvcmU6OkludFJlY3Qm IHJlY3QsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiB2aWV3UG9zaXRpb24pOwogICAgIHZvaWQg dXBkYXRlVmlld3BvcnRTaXplKGNvbnN0IFdlYkNvcmU6OkludFNpemUmIHZpZXdwb3J0U2l6ZSk7 CiAgICAgdm9pZCBzZXRWaXNpYmxlQ29udGVudHNSZWN0KGNvbnN0IFdlYkNvcmU6OkludFBvaW50 JiwgZmxvYXQsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UG9pbnQmKTsKICAgICB2b2lkIGRpZENoYW5n ZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAJKHJldmlzaW9uIDEz MTM5MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjc2LDYgKzY3Niw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19z bWFydF9jYWxjdWxhdGUoRXYKICAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IHNtYXJ0RGF0YSk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwg cHJpdik7CiAgICAgRXZhc19Db29yZCB4LCB5LCB3aWR0aCwgaGVpZ2h0OworICAgIGJvb2wgbmVl ZHNOZXdTdXJmYWNlID0gZmFsc2U7CiAKICAgICBzbWFydERhdGEtPmNoYW5nZWQuYW55ID0gZmFs c2U7CiAKQEAgLTY4NSwxOSArNjg2LDEzIEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9j YWxjdWxhdGUoRXYKICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCiAgICAgICAgIHByaXYt PnZpZXdwb3J0SGFuZGxlci0+dXBkYXRlVmlld3BvcnRTaXplKEludFNpemUod2lkdGgsIGhlaWdo dCkpOwogI2VuZGlmCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgICAgICBu ZWVkc05ld1N1cmZhY2UgPSBwcml2LT5ldmFzR2xTdXJmYWNlOworI2VuZGlmCiAKICAgICAgICAg aWYgKHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkKICAgICAgICAgICAgIHByaXYtPnBh Z2VQcm94eS0+ZHJhd2luZ0FyZWEoKS0+c2V0U2l6ZShJbnRTaXplKHdpZHRoLCBoZWlnaHQpLCBJ bnRTaXplKCkpOwogCi0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBp ZiAoIXByaXYtPmV2YXNHbFN1cmZhY2UpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGV2 YXNfZ2xfc3VyZmFjZV9kZXN0cm95KHByaXYtPmV2YXNHbCwgcHJpdi0+ZXZhc0dsU3VyZmFjZSk7 Ci0gICAgICAgIHByaXYtPmV2YXNHbFN1cmZhY2UgPSAwOwotICAgICAgICBld2tfdmlld19jcmVh dGVfZ2xfc3VyZmFjZShld2tWaWV3LCBJbnRTaXplKHdpZHRoLCBoZWlnaHQpKTsKLSAgICAgICAg ZXdrX3ZpZXdfZGlzcGxheShld2tWaWV3LCBJbnRSZWN0KEludFBvaW50KCksIEludFNpemUod2lk dGgsIGhlaWdodCkpKTsKLSNlbmRpZgotCiAgICAgICAgIHNtYXJ0RGF0YS0+dmlldy53ID0gd2lk dGg7CiAgICAgICAgIHNtYXJ0RGF0YS0+dmlldy5oID0gaGVpZ2h0OwogICAgICAgICBzbWFydERh dGEtPmNoYW5nZWQuc2l6ZSA9IGZhbHNlOwpAQCAtNzA5LDYgKzcwNCwxNSBAQCBzdGF0aWMgdm9p ZCBfZXdrX3ZpZXdfc21hcnRfY2FsY3VsYXRlKEV2CiAgICAgICAgIHNtYXJ0RGF0YS0+dmlldy55 ID0geTsKICAgICAgICAgc21hcnREYXRhLT5jaGFuZ2VkLnBvc2l0aW9uID0gZmFsc2U7CiAgICAg fQorCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorICAgIGlmIChuZWVkc05ld1N1 cmZhY2UpIHsKKyAgICAgICAgZXZhc19nbF9zdXJmYWNlX2Rlc3Ryb3kocHJpdi0+ZXZhc0dsLCBw cml2LT5ldmFzR2xTdXJmYWNlKTsKKyAgICAgICAgcHJpdi0+ZXZhc0dsU3VyZmFjZSA9IDA7Cisg ICAgICAgIGV3a192aWV3X2NyZWF0ZV9nbF9zdXJmYWNlKGV3a1ZpZXcsIEludFNpemUod2lkdGgs IGhlaWdodCkpOworICAgICAgICBld2tfdmlld19kaXNwbGF5KGV3a1ZpZXcsIEludFJlY3QoSW50 UG9pbnQoKSwgSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KSkpOworICAgIH0KKyNlbmRpZgogfQogCiBz dGF0aWMgdm9pZCBfZXdrX3ZpZXdfc21hcnRfc2hvdyhFdmFzX09iamVjdCogZXdrVmlldykKQEAg LTEzMTQsNyArMTMxOCw3IEBAIHZvaWQgZXdrX3ZpZXdfZGlzcGxheShFdmFzX09iamVjdCogZXdr VmkKICAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRhLCBwcml2KTsKIAog ICAgIGV2YXNfZ2xfbWFrZV9jdXJyZW50KHByaXYtPmV2YXNHbCwgcHJpdi0+ZXZhc0dsU3VyZmFj ZSwgcHJpdi0+ZXZhc0dsQ29udGV4dCk7Ci0gICAgcHJpdi0+dmlld3BvcnRIYW5kbGVyLT5kaXNw bGF5KHJlY3QpOworICAgIHByaXYtPnZpZXdwb3J0SGFuZGxlci0+ZGlzcGxheShyZWN0LCBJbnRQ b2ludChzbWFydERhdGEtPnZpZXcueCwgc21hcnREYXRhLT52aWV3LnkpKTsKICNlbmRpZgogCiAg ICAgZXZhc19vYmplY3RfaW1hZ2VfZGF0YV91cGRhdGVfYWRkKHNtYXJ0RGF0YS0+aW1hZ2UsIHJl Y3QueCgpLCByZWN0LnkoKSwgcmVjdC53aWR0aCgpLCByZWN0LmhlaWdodCgpKTsK