56966 2011-03-23 15:22:54 -0700 [GTK] window.innerWidth and window.innerHeight are wrong when using native scrollbars 2015-05-07 17:35:22 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson mrobinson eric oldest_to_newest 372486 0 mrobinson 2011-03-23 15:22:54 -0700 fast/overflow/horizontal-scroll-after-back.html fails on the bots. It appears that window.innerWidth and window.innerHeight do not include the space allocated for scrollbars, yet they should. 372495 1 86710 mrobinson 2011-03-23 15:31:00 -0700 Created attachment 86710 Patch 372507 2 mrobinson 2011-03-23 15:43:51 -0700 Committed r81817: <http://trac.webkit.org/changeset/81817> 392915 3 86710 xan.lopez 2011-04-26 16:01:15 -0700 Comment on attachment 86710 Patch Get out of the queue. 392936 4 86710 mrobinson 2011-04-26 16:08:57 -0700 Comment on attachment 86710 Patch Remarking for review. The committed patch just skipped the original failing test. :) 392981 5 86710 mrobinson 2011-04-26 16:21:22 -0700 Comment on attachment 86710 Patch r- because my ChangeLog is actually quite inadequate. 393093 6 91182 mrobinson 2011-04-26 16:57:07 -0700 Created attachment 91182 Patch with better ChangeLog 396051 7 eric 2011-05-01 14:46:20 -0700 The commit-queue does a last-minute check before landing to make sure the bug is still open, the patch is still not-obsolete, and cq+ is still set. You never have to worry about racing the cq. You can land things yourself and it won't complain, you can also mark things cq-, and unless you're exceptionally unlucky you'll always win. :) 396055 8 mrobinson 2011-05-01 14:48:33 -0700 (In reply to comment #7) > The commit-queue does a last-minute check before landing to make sure the bug is still open, the patch is still not-obsolete, and cq+ is still set. You never have to worry about racing the cq. You can land things yourself and it won't complain, you can also mark things cq-, and unless you're exceptionally unlucky you'll always win. :) Was this comment meant for another bug? 396059 9 eric 2011-05-01 14:52:59 -0700 (In reply to comment #8) > (In reply to comment #7) > > The commit-queue does a last-minute check before landing to make sure the bug is still open, the patch is still not-obsolete, and cq+ is still set. You never have to worry about racing the cq. You can land things yourself and it won't complain, you can also mark things cq-, and unless you're exceptionally unlucky you'll always win. :) > > Was this comment meant for another bug? Nope. Was replying mostly to comment #3. :) 396062 10 mrobinson 2011-05-01 15:00:33 -0700 (In reply to comment #9) > Was this comment meant for another bug? Oh, I see. Here is the sequence of events in this case: 1. I opened this bug about a failing test. 2. I landed a patch with --no-close, referencing this bug. The patch skipped the test. 3. I uploaded a patch containing a real fix to this same bug. 4. Xan saw comment #2 and assumed the first patch fixed the bug. He removed the r? from the patch. I talked about this with Daniel Bates the other day and he said his tactic is to land the first (skiplist) patch and them mark the bug as REOPENED. Perhaps that would make things less confusing in the future. 408391 11 91182 eric 2011-05-23 15:27:38 -0700 Comment on attachment 91182 Patch with better ChangeLog Do other ports do similarly? 408625 12 mrobinson 2011-05-23 21:16:14 -0700 (In reply to comment #11) > (From update of attachment 91182 [details]) > Do other ports do similarly? GTK+ is unique in itss ScrollView implementation because main frame scrollbars are drawn and owned by the containing GtkScrolledWindow. Thus, GTK+'s ScrollView must provide custom implementations of some ScrollView methods. At the same time GTK+ ScrollViews do not have a native widget backing them. At some point I'd like to increase code sharing, but it seems orthogonal to this patch. 412038 13 eric 2011-05-29 14:45:21 -0700 (In reply to comment #12) > (In reply to comment #11) > > (From update of attachment 91182 [details] [details]) > > Do other ports do similarly? > > GTK+ is unique in itss ScrollView implementation because main frame scrollbars are drawn and owned by the containing GtkScrolledWindow. Really? Doesn't the Mac port use native scrollbars too? Maybe those are drawn by the WebView though instead of an NSScrollView. > Thus, GTK+'s ScrollView must provide custom implementations of some ScrollView methods. At the same time GTK+ ScrollViews do not have a native widget backing them. I'm not sure I understand but I believe you this stuff is complicated. :) > At some point I'd like to increase code sharing, but it seems orthogonal to this patch. Yeah, I just worry that we're moving further from that, rather than closer. 498147 14 mrobinson 2011-11-08 09:37:34 -0800 This test is passing now that we've switched to using WebCore scrollbars in the DRT. 498148 15 mrobinson 2011-11-08 09:38:06 -0800 (In reply to comment #14) > This test is passing now that we've switched to using WebCore scrollbars in the DRT. I should mention that window.innerWidth and window.innerHeight are still incorrect when using native GTK+ main frame scrollbars. 1092898 16 mrobinson 2015-05-07 17:35:22 -0700 WebKit2 doesn't use native scrollbars. 86710 2011-03-23 15:31:00 -0700 2011-04-26 16:57:01 -0700 Patch bug-56966-20110323153057.patch text/plain 6320 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODE3ODUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NzAzMzc0NGZjM2FkYzdi NWNlN2FjYTYxYWM0ZGUyYWQ2ZjhkMzhlLi42ZWZmOGU3OTUyMjNjMjBkZjdlOGYxNmI3NmY2M2M4 ZTFjZDY0ZjhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDMtMjMgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIGZhc3Qvb3ZlcmZsb3cvaG9yaXpvbnRh bC1zY3JvbGwtYWZ0ZXItYmFjay5odG1sIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njk2NgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhp cyBwYXRjaCBpcyB0ZXN0ZWQgYnkgZmFzdC9vdmVyZmxvdy9ob3Jpem9udGFsLXNjcm9sbC1hZnRl ci1iYWNrLmh0bWwuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6IEFkZCBhbiBv dmVycmlkZSBmb3IgV2lkZ2V0OjpmcmFtZVJlY3QoKSBmb3IgR1RLKyBvbmx5LgorICAgICAgICAq IHBsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9s bFZpZXc6OnNldEhvcml6b250YWxBZGp1c3RtZW50KTogVXNlIFdpZGdldDo6ZnJhbWVSZWN0IGV4 cGxpY2l0bHkuCisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRWZXJ0aWNhbEFkanVz dG1lbnQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmZyYW1lUmVjdCk6 IE92ZXJyaWRlIHRoaXMgbWV0aG9kIHRvIGluY2x1ZGUgdGhlIGFsbG9jYXRpb24gZm9yCisgICAg ICAgIHBhcmVudCB3aWRnZXQgd2hlbiBpdCBpcyB0aGUgbWFpbiBmcmFtZSBhbmQgc2Nyb2xsYmFy cyBhcmUgYWN0aXZlLgorCiAyMDExLTAzLTIzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGNsYW5nIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5oCmluZGV4IDZlYjRjMGMxZGVmMzY5ODJlZjI4MzM5MzExZDgxNWE2N2FjMDk3 ZjIuLmRmZTUzZGY3MjQ0YzM3MmQ4Mzc5ZTcyOTEwOTkwOTEzYjI5ZWIwM2MgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKQEAgLTM4OCwxMiArMzg4LDEzIEBAIHByaXZhdGU6CiAg ICAgTlNTY3JvbGxWaWV3PFdlYkNvcmVGcmFtZVNjcm9sbFZpZXc+KiBzY3JvbGxWaWV3KCkgY29u c3Q7CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKEdUSykKKyNpZiBQTEFURk9STShHVEspICYmIFVT RShOQVRJVkVfR1RLX01BSU5fRlJBTUVfU0NST0xMQkFSKQogcHVibGljOgogICAgIHZvaWQgc2V0 R3RrQWRqdXN0bWVudHMoR3RrQWRqdXN0bWVudCogaGFkaiwgR3RrQWRqdXN0bWVudCogdmFkaiwg Ym9vbCByZXNldFZhbHVlcyA9IHRydWUpOwogICAgIHZvaWQgc2V0SG9yaXpvbnRhbEFkanVzdG1l bnQoR3RrQWRqdXN0bWVudCogaGFkaiwgYm9vbCByZXNldFZhbHVlcyA9IHRydWUpOwogICAgIHZv aWQgc2V0VmVydGljYWxBZGp1c3RtZW50KEd0a0FkanVzdG1lbnQqIHZhZGosIGJvb2wgcmVzZXRW YWx1ZXMgPSB0cnVlKTsKICAgICB2b2lkIHNldFNjcm9sbE9mZnNldChjb25zdCBJbnRTaXplJiBv ZmZzZXQpIHsgbV9zY3JvbGxPZmZzZXQgPSBvZmZzZXQ7IH0KKyAgICB2aXJ0dWFsIEludFJlY3Qg ZnJhbWVSZWN0KCkgY29uc3Q7CiAKIHByaXZhdGU6CiAgICAgR1JlZlB0cjxHdGtBZGp1c3RtZW50 PiBtX2hvcml6b250YWxBZGp1c3RtZW50OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Rr L1Njcm9sbFZpZXdHdGsuY3BwCmluZGV4IDUzY2FjZjczY2FiYzhkODFkYjQwNWQwYWFiNDZiMGJi NTc1ZjQ1MTcuLjFjZGE5ZjlkOGFiMGRlNzcxNGIwNGU1ODI5MzRmMWE5Y2MyM2Y5NGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAKQEAgLTEwOSwx MyArMTA5LDE0IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0SG9yaXpvbnRhbEFkanVzdG1lbnQoR3Rr QWRqdXN0bWVudCogaGFkaiwgYm9vbCByZXNldFZhbHVlcykKICAgICAvLyBzZXQgaW4gdGhlIG5v cm1hbCBjYXNlKSwgd2UgbWFrZSBzdXJlIHRoZXkgYXJlIHVwLXRvLWRhdGUKICAgICAvLyBoZXJl LiBUaGlzIGlzIG5lZWRlZCBmb3IgdGhlIHBhcmVudCBzY3JvbGxpbmcgd2lkZ2V0IHRvIGJlCiAg ICAgLy8gYWJsZSB0byByZXBvcnQgY29ycmVjdCB2YWx1ZXMuCi0gICAgaW50IGhvcml6b250YWxQ YWdlU3RlcCA9IG1heChtYXg8aW50PihmcmFtZVJlY3QoKS53aWR0aCgpICogU2Nyb2xsYmFyOjpt aW5GcmFjdGlvblRvU3RlcFdoZW5QYWdpbmcoKSwgZnJhbWVSZWN0KCkud2lkdGgoKSAtIFNjcm9s bGJhcjo6bWF4T3ZlcmxhcEJldHdlZW5QYWdlcygpKSwgMSk7CisgICAgSW50UmVjdCBmcmFtZVJl Y3QoV2lkZ2V0OjpmcmFtZVJlY3QoKSk7CisgICAgaW50IGhvcml6b250YWxQYWdlU3RlcCA9IG1h eChtYXg8aW50PihmcmFtZVJlY3Qud2lkdGgoKSAqIFNjcm9sbGJhcjo6bWluRnJhY3Rpb25Ub1N0 ZXBXaGVuUGFnaW5nKCksIGZyYW1lUmVjdC53aWR0aCgpIC0gU2Nyb2xsYmFyOjptYXhPdmVybGFw QmV0d2VlblBhZ2VzKCkpLCAxKTsKICAgICBndGtfYWRqdXN0bWVudF9jb25maWd1cmUobV9ob3Jp em9udGFsQWRqdXN0bWVudC5nZXQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVz ZXRWYWx1ZXMgPyAwIDogc2Nyb2xsT2Zmc2V0KCkud2lkdGgoKSwgMCwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogY29udGVudHNTaXplKCkud2lkdGgoKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogU2Nyb2xsYmFy OjpwaXhlbHNQZXJMaW5lU3RlcCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNl dFZhbHVlcyA/IDAgOiBob3Jpem9udGFsUGFnZVN0ZXAsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IGZyYW1lUmVjdCgpLndpZHRoKCkpOworICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBmcmFtZVJlY3Qud2lkdGgoKSk7 CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6c2V0VmVydGljYWxBZGp1c3RtZW50KEd0a0FkanVzdG1l bnQqIHZhZGosIGJvb2wgcmVzZXRWYWx1ZXMpCkBAIC0xNDgsMTMgKzE0OSwxNCBAQCB2b2lkIFNj cm9sbFZpZXc6OnNldFZlcnRpY2FsQWRqdXN0bWVudChHdGtBZGp1c3RtZW50KiB2YWRqLCBib29s IHJlc2V0VmFsdWVzKQogICAgIC8vIHNldCBpbiB0aGUgbm9ybWFsIGNhc2UpLCB3ZSBtYWtlIHN1 cmUgdGhleSBhcmUgdXAtdG8tZGF0ZQogICAgIC8vIGhlcmUuIFRoaXMgaXMgbmVlZGVkIGZvciB0 aGUgcGFyZW50IHNjcm9sbGluZyB3aWRnZXQgdG8gYmUKICAgICAvLyBhYmxlIHRvIHJlcG9ydCBj b3JyZWN0IHZhbHVlcy4KLSAgICBpbnQgdmVydGljYWxQYWdlU3RlcCA9IG1heChtYXg8aW50Pihm cmFtZVJlY3QoKS53aWR0aCgpICogU2Nyb2xsYmFyOjptaW5GcmFjdGlvblRvU3RlcFdoZW5QYWdp bmcoKSwgZnJhbWVSZWN0KCkud2lkdGgoKSAtIFNjcm9sbGJhcjo6bWF4T3ZlcmxhcEJldHdlZW5Q YWdlcygpKSwgMSk7CisgICAgSW50UmVjdCBmcmFtZVJlY3QoV2lkZ2V0OjpmcmFtZVJlY3QoKSk7 CisgICAgaW50IHZlcnRpY2FsUGFnZVN0ZXAgPSBtYXgobWF4PGludD4oZnJhbWVSZWN0LndpZHRo KCkgKiBTY3JvbGxiYXI6Om1pbkZyYWN0aW9uVG9TdGVwV2hlblBhZ2luZygpLCBmcmFtZVJlY3Qu d2lkdGgoKSAtIFNjcm9sbGJhcjo6bWF4T3ZlcmxhcEJldHdlZW5QYWdlcygpKSwgMSk7CiAgICAg Z3RrX2FkanVzdG1lbnRfY29uZmlndXJlKG1fdmVydGljYWxBZGp1c3RtZW50LmdldCgpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBzY3JvbGxPZmZzZXQo KS5oZWlnaHQoKSwgMCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMg PyAwIDogY29udGVudHNTaXplKCkuaGVpZ2h0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlc2V0VmFsdWVzID8gMCA6IFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogdmVydGljYWxQYWdl U3RlcCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogZnJh bWVSZWN0KCkuaGVpZ2h0KCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZh bHVlcyA/IDAgOiBmcmFtZVJlY3QuaGVpZ2h0KCkpOwogfQogCiB2b2lkIFNjcm9sbFZpZXc6OnNl dEd0a0FkanVzdG1lbnRzKEd0a0FkanVzdG1lbnQqIGhhZGosIEd0a0FkanVzdG1lbnQqIHZhZGos IGJvb2wgcmVzZXRWYWx1ZXMpCkBAIC0xOTAsNiArMTkyLDM2IEBAIEludFJlY3QgU2Nyb2xsVmll dzo6dmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0CiAgICAg ICAgICAgICAgICAgICAgSW50U2l6ZShhbGxvY2F0aW9uLndpZHRoLCBhbGxvY2F0aW9uLmhlaWdo dCkpOwogfQogCitJbnRSZWN0IFNjcm9sbFZpZXc6OmZyYW1lUmVjdCgpIGNvbnN0Cit7CisgICAg aWYgKHBhcmVudCgpIHx8ICFob3N0V2luZG93KCkgfHwgIWhvc3RXaW5kb3coKS0+cGxhdGZvcm1Q YWdlQ2xpZW50KCkgfHwgIXZlcnRpY2FsU2Nyb2xsYmFyKCkpCisgICAgICAgIHJldHVybiBXaWRn ZXQ6OmZyYW1lUmVjdCgpOworICAgIGlmICghaG9yaXpvbnRhbFNjcm9sbGJhcigpICYmICF2ZXJ0 aWNhbFNjcm9sbGJhcigpKQorICAgICAgICByZXR1cm4gV2lkZ2V0OjpmcmFtZVJlY3QoKTsKKwor ICAgIC8vIEZvciBtYWluIGZyYW1lIHNjcm9sbGJhcnMgd2UgdXNlIHRoZSBwYXJlbnQgYWxsb2Nh dGlvbiB0byBmaWd1cmUgb3V0IHRoZSB0b3RhbAorICAgIC8vIGZyYW1lIHJlY3Qgc2l6ZS4gVGhl IHJlYXNvbmluZyBpcyB0aGF0IGZyYW1lUmVjdCgpIHNob3VsZCBpbmNsdWRlIHRoZSBzcGFjZSBm b3IKKyAgICAvLyB0aGUgc2Nyb2xsYmFycy4KKyAgICBHdGtXaWRnZXQqIG1lYXN1cmVkV2lkZ2V0 ID0gaG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKTsKKyAgICBHdGtXaWRnZXQqIHBh cmVudFdpZGdldCA9IGd0a193aWRnZXRfZ2V0X3BhcmVudChtZWFzdXJlZFdpZGdldCk7CisKKyAg ICAvLyBXZSBtYXkgbm90IGJlIGluIGEgd2lkZ2V0IHRoYXQgZGlzcGxheXMgc2Nyb2xsYmFycywg YnV0IHdlIG1heQorICAgIC8vIGhhdmUgb3RoZXIga2luZHMgb2YgZGVjb3JhdGlvbiB0aGF0IG1h a2UgdXMgc21hbGxlci4KKyAgICBpZiAoIXBhcmVudFdpZGdldCkKKyAgICAgICAgcmV0dXJuIFdp ZGdldDo6ZnJhbWVSZWN0KCk7CisKKyAgICBHdGtBbGxvY2F0aW9uIGFsbG9jYXRpb247CisgICAg Z3RrX3dpZGdldF9nZXRfYWxsb2NhdGlvbihwYXJlbnRXaWRnZXQsICZhbGxvY2F0aW9uKTsKKwor ICAgIEludFJlY3QgZnJhbWVSZWN0KFdpZGdldDo6ZnJhbWVSZWN0KCkpOworICAgIGlmICh2ZXJ0 aWNhbFNjcm9sbGJhcigpKQorICAgICAgICBmcmFtZVJlY3Quc2V0V2lkdGgoYWxsb2NhdGlvbi53 aWR0aCk7CisgICAgaWYgKGhvcml6b250YWxTY3JvbGxiYXIoKSkKKyAgICAgICAgZnJhbWVSZWN0 LnNldEhlaWdodChhbGxvY2F0aW9uLmhlaWdodCk7CisgICAgcmV0dXJuIGZyYW1lUmVjdDsKKwor fQorCiB2b2lkIFNjcm9sbFZpZXc6OnNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhck1vZGUgaG9y aXpvbnRhbE1vZGUsIFNjcm9sbGJhck1vZGUgdmVydGljYWxNb2RlLCBib29sIGhvcml6b250YWxM b2NrLCBib29sIHZlcnRpY2FsTG9jaykKIHsKICAgICAvLyBGSVhNRTogUmVzdHJ1Y3R1cmUgdGhl IFNjcm9sbFZpZXcgYWJzdHJhY3Rpb24gc28gdGhhdCB3ZSBkbyBub3QgaGF2ZSB0bwo= 91182 2011-04-26 16:57:07 -0700 2011-11-08 09:38:24 -0800 Patch with better ChangeLog bug-56966-20110426165706.patch text/plain 6637 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5NzkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZDFjMzIxYTI2NWQ0OWE1 YWZlNWVkZmVkZjZlNDA4NzhiM2NkMTVjLi5lNTQzMWZhMGQ5NTMwNWIzNGRmNDI1MDlhNTNlMGM1 YTE0YzZmNGU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjUgQEAKIDIwMTEtMDQtMjYgIE1hcnRp biBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIGZhc3Qvb3ZlcmZsb3cvaG9yaXpvbnRh bC1zY3JvbGwtYWZ0ZXItYmFjay5odG1sIGZhaWxzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njk2NgorCisgICAgICAgIEFkZCBhIHNwZWNpYWxpemVk IGltcGxlbWVudGF0aW9uIG9mIFNjcm9sbFZpZXc6OmZyYW1lUmVjdCBmb3IgR1RLKywgd2hpY2gg dGFrZXMKKyAgICAgICAgaW50byBhY2NvdW50IHRoZSBuYXRpdmUgc2Nyb2xsYmFycyBmb3IgbWFp biBmcmFtZXMuIFdpdGhvdXQgdGhpcyBmaXgsIHRoZSBtYWluIGZyYW1lIHdpbGwKKyAgICAgICAg c2VlbSB0b28gc21hbGwuIAorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBwYXRjaCBpcyB0 ZXN0ZWQgYnkgZmFzdC9vdmVyZmxvdy9ob3Jpem9udGFsLXNjcm9sbC1hZnRlci1iYWNrLmh0bWwu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxWaWV3Lmg6IEFkZCBhbiBvdmVycmlkZSBmb3Ig V2lkZ2V0OjpmcmFtZVJlY3QoKSBmb3IgR1RLKyBvbmx5LgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9TY3JvbGxWaWV3R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OnNldEhv cml6b250YWxBZGp1c3RtZW50KTogVXNlIFdpZGdldDo6ZnJhbWVSZWN0IGV4cGxpY2l0bHkuCisg ICAgICAgIChXZWJDb3JlOjpTY3JvbGxWaWV3OjpzZXRWZXJ0aWNhbEFkanVzdG1lbnQpOiBEaXR0 by4KKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbFZpZXc6OmZyYW1lUmVjdCk6IE92ZXJyaWRlIHRo aXMgbWV0aG9kIHRvIGluY2x1ZGUgdGhlIGFsbG9jYXRpb24gZm9yCisgICAgICAgIHBhcmVudCB3 aWRnZXQgd2hlbiBpdCBpcyB0aGUgbWFpbiBmcmFtZSBhbmQgc2Nyb2xsYmFycyBhcmUgYWN0aXZl LgorCisyMDExLTA0LTI2ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4K KwogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCiAKICAgICAgICAgW0dUS10gRmxh c2ggaW4gZGl2cyB3aXRoIG92ZXJmbG93OiBhdXRvIGlzIG5vdCBwb3NpdGlvbmVkIGFuZCBjbGlw cGVkIHByb3Blcmx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKaW5kZXggMjQzMDI4 ZTk2ZjI0ZjQ3MDk5ZDBjMmRmNzRkYjk1OWNjY2UyODVmNC4uNTQ4MDZmMjA1ZTczODllMTQxNjE1 YjczZTVkNzVkZGY3YzhkYmUwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v U2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaApA QCAtNDAyLDEyICs0MDIsMTMgQEAgcHJpdmF0ZToKICAgICBOU1Njcm9sbFZpZXc8V2ViQ29yZUZy YW1lU2Nyb2xsVmlldz4qIHNjcm9sbFZpZXcoKSBjb25zdDsKICNlbmRpZgogCi0jaWYgUExBVEZP Uk0oR1RLKQorI2lmIFBMQVRGT1JNKEdUSykgJiYgVVNFKE5BVElWRV9HVEtfTUFJTl9GUkFNRV9T Q1JPTExCQVIpCiBwdWJsaWM6CiAgICAgdm9pZCBzZXRHdGtBZGp1c3RtZW50cyhHdGtBZGp1c3Rt ZW50KiBoYWRqLCBHdGtBZGp1c3RtZW50KiB2YWRqLCBib29sIHJlc2V0VmFsdWVzID0gdHJ1ZSk7 CiAgICAgdm9pZCBzZXRIb3Jpem9udGFsQWRqdXN0bWVudChHdGtBZGp1c3RtZW50KiBoYWRqLCBi b29sIHJlc2V0VmFsdWVzID0gdHJ1ZSk7CiAgICAgdm9pZCBzZXRWZXJ0aWNhbEFkanVzdG1lbnQo R3RrQWRqdXN0bWVudCogdmFkaiwgYm9vbCByZXNldFZhbHVlcyA9IHRydWUpOwogICAgIHZvaWQg c2V0U2Nyb2xsT2Zmc2V0KGNvbnN0IEludFNpemUmIG9mZnNldCkgeyBtX3Njcm9sbE9mZnNldCA9 IG9mZnNldDsgfQorICAgIHZpcnR1YWwgSW50UmVjdCBmcmFtZVJlY3QoKSBjb25zdDsKIAogcHJp dmF0ZToKICAgICBHUmVmUHRyPEd0a0FkanVzdG1lbnQ+IG1faG9yaXpvbnRhbEFkanVzdG1lbnQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAKaW5kZXgg NTNjYWNmNzNjYWJjOGQ4MWRiNDA1ZDBhYWI0NmIwYmI1NzVmNDUxNy4uMWNkYTlmOWQ4YWIwZGU3 NzE0YjA0ZTU4MjkzNGYxYTljYzIzZjk0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9TY3JvbGxWaWV3R3RrLmNwcApAQCAtMTA5LDEzICsxMDksMTQgQEAgdm9pZCBTY3JvbGxW aWV3OjpzZXRIb3Jpem9udGFsQWRqdXN0bWVudChHdGtBZGp1c3RtZW50KiBoYWRqLCBib29sIHJl c2V0VmFsdWVzKQogICAgIC8vIHNldCBpbiB0aGUgbm9ybWFsIGNhc2UpLCB3ZSBtYWtlIHN1cmUg dGhleSBhcmUgdXAtdG8tZGF0ZQogICAgIC8vIGhlcmUuIFRoaXMgaXMgbmVlZGVkIGZvciB0aGUg cGFyZW50IHNjcm9sbGluZyB3aWRnZXQgdG8gYmUKICAgICAvLyBhYmxlIHRvIHJlcG9ydCBjb3Jy ZWN0IHZhbHVlcy4KLSAgICBpbnQgaG9yaXpvbnRhbFBhZ2VTdGVwID0gbWF4KG1heDxpbnQ+KGZy YW1lUmVjdCgpLndpZHRoKCkgKiBTY3JvbGxiYXI6Om1pbkZyYWN0aW9uVG9TdGVwV2hlblBhZ2lu ZygpLCBmcmFtZVJlY3QoKS53aWR0aCgpIC0gU2Nyb2xsYmFyOjptYXhPdmVybGFwQmV0d2VlblBh Z2VzKCkpLCAxKTsKKyAgICBJbnRSZWN0IGZyYW1lUmVjdChXaWRnZXQ6OmZyYW1lUmVjdCgpKTsK KyAgICBpbnQgaG9yaXpvbnRhbFBhZ2VTdGVwID0gbWF4KG1heDxpbnQ+KGZyYW1lUmVjdC53aWR0 aCgpICogU2Nyb2xsYmFyOjptaW5GcmFjdGlvblRvU3RlcFdoZW5QYWdpbmcoKSwgZnJhbWVSZWN0 LndpZHRoKCkgLSBTY3JvbGxiYXI6Om1heE92ZXJsYXBCZXR3ZWVuUGFnZXMoKSksIDEpOwogICAg IGd0a19hZGp1c3RtZW50X2NvbmZpZ3VyZShtX2hvcml6b250YWxBZGp1c3RtZW50LmdldCgpLAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBzY3JvbGxPZmZz ZXQoKS53aWR0aCgpLCAwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVl cyA/IDAgOiBjb250ZW50c1NpemUoKS53aWR0aCgpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZXNldFZhbHVlcyA/IDAgOiBTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCksCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IGhvcml6b250YWxQ YWdlU3RlcCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDog ZnJhbWVSZWN0KCkud2lkdGgoKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0 VmFsdWVzID8gMCA6IGZyYW1lUmVjdC53aWR0aCgpKTsKIH0KIAogdm9pZCBTY3JvbGxWaWV3Ojpz ZXRWZXJ0aWNhbEFkanVzdG1lbnQoR3RrQWRqdXN0bWVudCogdmFkaiwgYm9vbCByZXNldFZhbHVl cykKQEAgLTE0OCwxMyArMTQ5LDE0IEBAIHZvaWQgU2Nyb2xsVmlldzo6c2V0VmVydGljYWxBZGp1 c3RtZW50KEd0a0FkanVzdG1lbnQqIHZhZGosIGJvb2wgcmVzZXRWYWx1ZXMpCiAgICAgLy8gc2V0 IGluIHRoZSBub3JtYWwgY2FzZSksIHdlIG1ha2Ugc3VyZSB0aGV5IGFyZSB1cC10by1kYXRlCiAg ICAgLy8gaGVyZS4gVGhpcyBpcyBuZWVkZWQgZm9yIHRoZSBwYXJlbnQgc2Nyb2xsaW5nIHdpZGdl dCB0byBiZQogICAgIC8vIGFibGUgdG8gcmVwb3J0IGNvcnJlY3QgdmFsdWVzLgotICAgIGludCB2 ZXJ0aWNhbFBhZ2VTdGVwID0gbWF4KG1heDxpbnQ+KGZyYW1lUmVjdCgpLndpZHRoKCkgKiBTY3Jv bGxiYXI6Om1pbkZyYWN0aW9uVG9TdGVwV2hlblBhZ2luZygpLCBmcmFtZVJlY3QoKS53aWR0aCgp IC0gU2Nyb2xsYmFyOjptYXhPdmVybGFwQmV0d2VlblBhZ2VzKCkpLCAxKTsKKyAgICBJbnRSZWN0 IGZyYW1lUmVjdChXaWRnZXQ6OmZyYW1lUmVjdCgpKTsKKyAgICBpbnQgdmVydGljYWxQYWdlU3Rl cCA9IG1heChtYXg8aW50PihmcmFtZVJlY3Qud2lkdGgoKSAqIFNjcm9sbGJhcjo6bWluRnJhY3Rp b25Ub1N0ZXBXaGVuUGFnaW5nKCksIGZyYW1lUmVjdC53aWR0aCgpIC0gU2Nyb2xsYmFyOjptYXhP dmVybGFwQmV0d2VlblBhZ2VzKCkpLCAxKTsKICAgICBndGtfYWRqdXN0bWVudF9jb25maWd1cmUo bV92ZXJ0aWNhbEFkanVzdG1lbnQuZ2V0KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJlc2V0VmFsdWVzID8gMCA6IHNjcm9sbE9mZnNldCgpLmhlaWdodCgpLCAwLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBjb250ZW50c1NpemUoKS5oZWln aHQoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVzZXRWYWx1ZXMgPyAwIDogU2Ny b2xsYmFyOjpwaXhlbHNQZXJMaW5lU3RlcCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXNldFZhbHVlcyA/IDAgOiB2ZXJ0aWNhbFBhZ2VTdGVwLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByZXNldFZhbHVlcyA/IDAgOiBmcmFtZVJlY3QoKS5oZWlnaHQoKSk7CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJlc2V0VmFsdWVzID8gMCA6IGZyYW1lUmVjdC5oZWln aHQoKSk7CiB9CiAKIHZvaWQgU2Nyb2xsVmlldzo6c2V0R3RrQWRqdXN0bWVudHMoR3RrQWRqdXN0 bWVudCogaGFkaiwgR3RrQWRqdXN0bWVudCogdmFkaiwgYm9vbCByZXNldFZhbHVlcykKQEAgLTE5 MCw2ICsxOTIsMzYgQEAgSW50UmVjdCBTY3JvbGxWaWV3Ojp2aXNpYmxlQ29udGVudFJlY3QoYm9v bCBpbmNsdWRlU2Nyb2xsYmFycykgY29uc3QKICAgICAgICAgICAgICAgICAgICBJbnRTaXplKGFs bG9jYXRpb24ud2lkdGgsIGFsbG9jYXRpb24uaGVpZ2h0KSk7CiB9CiAKK0ludFJlY3QgU2Nyb2xs Vmlldzo6ZnJhbWVSZWN0KCkgY29uc3QKK3sKKyAgICBpZiAocGFyZW50KCkgfHwgIWhvc3RXaW5k b3coKSB8fCAhaG9zdFdpbmRvdygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKSB8fCAhdmVydGljYWxT Y3JvbGxiYXIoKSkKKyAgICAgICAgcmV0dXJuIFdpZGdldDo6ZnJhbWVSZWN0KCk7CisgICAgaWYg KCFob3Jpem9udGFsU2Nyb2xsYmFyKCkgJiYgIXZlcnRpY2FsU2Nyb2xsYmFyKCkpCisgICAgICAg IHJldHVybiBXaWRnZXQ6OmZyYW1lUmVjdCgpOworCisgICAgLy8gRm9yIG1haW4gZnJhbWUgc2Ny b2xsYmFycyB3ZSB1c2UgdGhlIHBhcmVudCBhbGxvY2F0aW9uIHRvIGZpZ3VyZSBvdXQgdGhlIHRv dGFsCisgICAgLy8gZnJhbWUgcmVjdCBzaXplLiBUaGUgcmVhc29uaW5nIGlzIHRoYXQgZnJhbWVS ZWN0KCkgc2hvdWxkIGluY2x1ZGUgdGhlIHNwYWNlIGZvcgorICAgIC8vIHRoZSBzY3JvbGxiYXJz LgorICAgIEd0a1dpZGdldCogbWVhc3VyZWRXaWRnZXQgPSBob3N0V2luZG93KCktPnBsYXRmb3Jt UGFnZUNsaWVudCgpOworICAgIEd0a1dpZGdldCogcGFyZW50V2lkZ2V0ID0gZ3RrX3dpZGdldF9n ZXRfcGFyZW50KG1lYXN1cmVkV2lkZ2V0KTsKKworICAgIC8vIFdlIG1heSBub3QgYmUgaW4gYSB3 aWRnZXQgdGhhdCBkaXNwbGF5cyBzY3JvbGxiYXJzLCBidXQgd2UgbWF5CisgICAgLy8gaGF2ZSBv dGhlciBraW5kcyBvZiBkZWNvcmF0aW9uIHRoYXQgbWFrZSB1cyBzbWFsbGVyLgorICAgIGlmICgh cGFyZW50V2lkZ2V0KQorICAgICAgICByZXR1cm4gV2lkZ2V0OjpmcmFtZVJlY3QoKTsKKworICAg IEd0a0FsbG9jYXRpb24gYWxsb2NhdGlvbjsKKyAgICBndGtfd2lkZ2V0X2dldF9hbGxvY2F0aW9u KHBhcmVudFdpZGdldCwgJmFsbG9jYXRpb24pOworCisgICAgSW50UmVjdCBmcmFtZVJlY3QoV2lk Z2V0OjpmcmFtZVJlY3QoKSk7CisgICAgaWYgKHZlcnRpY2FsU2Nyb2xsYmFyKCkpCisgICAgICAg IGZyYW1lUmVjdC5zZXRXaWR0aChhbGxvY2F0aW9uLndpZHRoKTsKKyAgICBpZiAoaG9yaXpvbnRh bFNjcm9sbGJhcigpKQorICAgICAgICBmcmFtZVJlY3Quc2V0SGVpZ2h0KGFsbG9jYXRpb24uaGVp Z2h0KTsKKyAgICByZXR1cm4gZnJhbWVSZWN0OworCit9CisKIHZvaWQgU2Nyb2xsVmlldzo6c2V0 U2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsTW9kZSwgU2Nyb2xsYmFyTW9k ZSB2ZXJ0aWNhbE1vZGUsIGJvb2wgaG9yaXpvbnRhbExvY2ssIGJvb2wgdmVydGljYWxMb2NrKQog ewogICAgIC8vIEZJWE1FOiBSZXN0cnVjdHVyZSB0aGUgU2Nyb2xsVmlldyBhYnN0cmFjdGlvbiBz byB0aGF0IHdlIGRvIG5vdCBoYXZlIHRvCg==