49177 2010-11-08 07:48:59 -0800 [GTK] fast/events/scroll-after-click-on-tab-index has been failing on the bots 2011-02-22 13:02:19 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P3 Normal --- 1 mrobinson webkit-unassigned eric jamesr pkasting pnormand sam tonikitoo yael oldest_to_newest 306122 0 mrobinson 2010-11-08 07:48:59 -0800 Here's the diff: --- /home/slave/webkitgtk/gtk-linux-64-debug/build/layout-test-results/fast/events/scroll-after-click-on-tab-index-expected.txt 2010-11-08 07:07:21.665738800 -0800 +++ /home/slave/webkitgtk/gtk-linux-64-debug/build/layout-test-results/fast/events/scroll-after-click-on-tab-index-actual.txt 2010-11-08 07:07:21.665738800 -0800 @@ -4,7 +4,7 @@ TEST COMPLETE Scroll position is more than 0 -PASS document.body.scrollTop > 0 is true +FAIL document.body.scrollTop > 0 should be true. Was false. 334679 1 mrobinson 2011-01-14 15:39:30 -0800 The issue here seems to be that dead scrollbars (ones that have been removed from the main frame) can still control the WebCore's scrollbars after they have been removed. In this case dead scrollbars were stomping on the scrollbar value. 334690 2 79018 mrobinson 2011-01-14 15:52:11 -0800 Created attachment 79018 Patch 335114 3 79018 xan.lopez 2011-01-16 18:35:54 -0800 Comment on attachment 79018 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=79018&action=review r=me > Source/WebCore/platform/gtk/ScrollViewGtk.cpp:84 > + // we must to inform main frame scrollbars that their adjustments no longer control the s/we must to/we must/ 335142 4 mrobinson 2011-01-16 22:25:20 -0800 Committed r75914: <http://trac.webkit.org/changeset/75914> 335144 5 79018 mrobinson 2011-01-16 22:26:46 -0800 Comment on attachment 79018 Patch Thanks for the review! Fixed and landed. 335180 6 pnormand 2011-01-17 00:20:07 -0800 This patch made the 3 GTK bots really unhappy. Gonna roll out, sorry! 335185 7 pnormand 2011-01-17 00:27:44 -0800 Reverted r75914 for reason: multiple crashes on GTK Committed r75924: <http://trac.webkit.org/changeset/75924> 335190 8 mrobinson 2011-01-17 00:32:56 -0800 (In reply to comment #7) > Reverted r75914 for reason: > multiple crashes on GTK > Committed r75924: <http://trac.webkit.org/changeset/75924> Thanks for the rollout. I'll take another look soon. 335200 9 mrobinson 2011-01-17 01:18:24 -0800 (In reply to comment #8) > (In reply to comment #7) > > Reverted r75914 for reason: > > multiple crashes on GTK > > Committed r75924: <http://trac.webkit.org/changeset/75924> > Thanks for the rollout. I'll take another look soon. It seems there are some cases where non-mainframe scrollbars do not have a parent. I should have a new, even-simpler fix for this issue posted soon. 335216 10 79143 mrobinson 2011-01-17 02:04:19 -0800 Created attachment 79143 Patch 335217 11 mrobinson 2011-01-17 02:05:03 -0800 I've uploaded a new patch which makes the determination if a scrollbar is defunct lazily. It seems there is no reasonable way to determine when the child is removed whether or not it is a main frame scrollbar. 339322 12 eric 2011-01-24 15:43:10 -0800 I feel like Jamesr recently fixed a parent-less scrollbars issue involving tables on some brazilian photos-of-women-being-stupid site the other day. I wonder if that's at all related to the case where you're seeing scrollbars w/o parents. 339328 13 jamesr 2011-01-24 15:49:19 -0800 Adding some scrollbar people. Offhand, I'm not totally sure what's going on here :) 339342 14 pkasting 2011-01-24 16:03:23 -0800 Sorry, I don't think I can offer any insight :( 339346 15 mrobinson 2011-01-24 16:06:58 -0800 (In reply to comment #13) > Adding some scrollbar people. Offhand, I'm not totally sure what's going on here :) Just to clarify there are two issues here: 1. The issue of the bug itself, which comes about because GTK+ mainframe scrollbars are native and the WebCore state is controlled asynchronously via GtkAdjustments. 2. The reason for failure of my first attempt, which is that at certain points in the mainframe scrollbar's lifetime it doesn't have a parent. I'm not entirely sure if this is a bug or not, but my second patch does not have that assumption any longer. 354942 16 79143 xan.lopez 2011-02-21 17:59:14 -0800 Comment on attachment 79143 Patch OK, seems reasonable to me. 355535 17 mrobinson 2011-02-22 13:02:04 -0800 Committed r79349: <http://trac.webkit.org/changeset/79349> 79018 2011-01-14 15:52:11 -0800 2011-01-17 02:04:15 -0800 Patch bug-49177-20110114155211.patch text/plain 7662 mrobinson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxYjZjODgwYzNhNWZmYTcwNjY1NjUwNDBhZTQ0YzY0ODc2OGVhYmVmLi5lZGM1YThk NWUzYWIzODFiZjIzOTFkZjQxNDQ0MzE0YzQ0NzBlMTkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDEtMTQgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIGZhc3Qv ZXZlbnRzL3Njcm9sbC1hZnRlci1jbGljay1vbi10YWItaW5kZXggaGFzIGJlZW4gZmFpbGluZyBv biB0aGUgYm90cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDkxNzcKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOiBVbnNraXAgdGhpcyB0 ZXN0LCBhcyBpdCdzIG5vdyBwYXNzaW5nLgorCiAyMDExLTAxLTEzICBNYXJ0aW4gUm9iaW5zb24g IDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBVbnNraXAgZWRpdGluZy9pbnB1dC9w YWdlLXVwLWRvd24tc2Nyb2xscy5odG1sIGFzIGl0J3MgcGFzc2luZyBsb2NhbGx5LgpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvU2tpcHBlZAppbmRleCBmZDBiNzdhNmJjNDhmMWExMjcxNjk4NGRiYmM1Y2YzYmM5 OTRkZDhmLi5hYzYwNGVlNTVmYjlkZTVhOTY0OThmZTcyMTRlMThhZTViMDIyNmM4IDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtNTUyNCw5ICs1NTI0LDYgQEAgZmFzdC9mcmFtZXMvbWV0 YS1yZWZyZXNoLXVzZXItZ2VzdHVyZS5odG1sCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00OTA1MgogZmFzdC9jYW52YXMvcG9pbnRJblBhdGguaHRtbAogCi0jIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTE3NwotZmFzdC9ldmVudHMv c2Nyb2xsLWFmdGVyLWNsaWNrLW9uLXRhYi1pbmRleC5odG1sCi0KICMgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MTc5CiBhbmltYXRpb25zL3N0b3AtYW5pbWF0aW9u LW9uLXN1c3BlbmQuaHRtbAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGQ2ODYxOWVmZTVjMGYxMjE3ZGIwN2Vh ZWFlNWZlZDI1MjEzZTg0Yy4uNmJkZmNlZTc3MjRkMzUxZWYzNWEzNjI4NDllOWRlZDhkMDA3MThj MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDExLTAxLTE0ICBNYXJ0aW4gUm9iaW5z b24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbR1RLXSBmYXN0L2V2ZW50cy9zY3JvbGwtYWZ0ZXItY2xpY2st b24tdGFiLWluZGV4IGhhcyBiZWVuIGZhaWxpbmcgb24gdGhlIGJvdHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MTc3CisKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcDogTW92ZSB0aGUgcGxhdGZvcm0gZ3VhcmRzIGFyb3VuZCBhIGxp dHRsZS4gR1RLKworICAgICAgICBub3cgc2hhcmVzIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBwbGF0 Zm9ybUFkZENoaWxkIGFuZCBwbGF0Zm9ybVJlbW92ZUNoaWxkLAorICAgICAgICBidXQgaGFzIGl0 cyBvd24gaW1wbGVtZW50YXRpb24gb2YgcmVtb3ZlQ2hpbGQsIHdoaWNoIGtub3dzIGhvdyB0byBp bmZvcm0KKyAgICAgICAgbWFpbiBmcmFtZSBzY3JvbGxiYXJzIHRoYXQgdGhleSBubyBsb25nZXIg Y29udHJvbCB0aGUgV2ViQ29yZSBzY3JvbGxiYXIuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL01h aW5GcmFtZVNjcm9sbGJhckd0ay5jcHA6CisgICAgICAgIChNYWluRnJhbWVTY3JvbGxiYXJHdGs6 OmF0dGFjaEFkanVzdG1lbnQpOiBJZiB3ZSBhcmUgYXR0YWNoaW5nIHRoZSBzYW1lIGFkanVzdG1l bnQKKyAgICAgICAgdGhhdCB3ZSBhbHJlYWR5IGhhdmUsIGJhaWwgb3V0IGVhcmx5LiBBcHBseSB0 aGUgdmFsdWUgY2hhbmdlZCBzaWduYWwgaGFuZGxlcgorICAgICAgICBhZnRlciBjb25maWd1cmlu ZyB0aGUgYWRqdXN0bWVudC4gV2UgZG9uJ3Qgd2FudCBvdXIgcmVzZXQgb2YgdGhlIGFkanVzdG1l bnQgdG8KKyAgICAgICAgc3RvbXAgb24gV2ViQ29yZSB2YWx1ZXMuCisgICAgICAgIChNYWluRnJh bWVTY3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCk6IERvIG5vdCBhZGp1c3QgdGhlIHZhbHVl IGlmIHRoZSBXZWJDb3JlCisgICAgICAgIHN0YXRlIGFscmVhZHkgbWF0Y2hlcyBvdXJzLiBUaGlz IHByZXZlbnRzIHNvbWUgdW5uZWNlc3NhcnkgcmVjdXJzaW9uCisgICAgICAgICogcGxhdGZvcm0v Z3RrL1Njcm9sbFZpZXdHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsVmlldzo6cmVt b3ZlQ2hpbGQpOiBBZGRlZCwgc3BlY2lhbCBjYXNlcyBtYWluIGZyYW1lIHNjcm9sbGJhcnMKKyAg ICAgICAgd2hpY2ggbmVlZCB0aGVpciBhZGp1c3RtZW50cyBkZXRhY2hlZC4KKwogMjAxMS0wMS0x MyAgSmlhbiBMaSAgPGppYW5saUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gRmlzaGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs Vmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmNwcAppbmRleCA2 Y2YxM2E0OTZjYzQ1ZGJlY2U3NDE5Y2U2MTc2MzhjZWI4MmU4ZTM1Li5lODYzMWUwMGRkZjY0ZGU5 ODQ5Y2I4ZDM4MDFiYTAzZjI4YWIyY2VjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmNwcApAQCAtNzUsNiArNzUsNyBAQCB2b2lkIFNjcm9sbFZpZXc6OmFkZENoaWxkKFBhc3NS ZWZQdHI8V2lkZ2V0PiBwcnBDaGlsZCkKICAgICAgICAgcGxhdGZvcm1BZGRDaGlsZChjaGlsZCk7 CiB9CiAKKyNpZiAhUExBVEZPUk0oR1RLKQogdm9pZCBTY3JvbGxWaWV3OjpyZW1vdmVDaGlsZChX aWRnZXQqIGNoaWxkKQogewogICAgIEFTU0VSVChjaGlsZC0+cGFyZW50KCkgPT0gdGhpcyk7CkBA IC04Myw2ICs4NCw3IEBAIHZvaWQgU2Nyb2xsVmlldzo6cmVtb3ZlQ2hpbGQoV2lkZ2V0KiBjaGls ZCkKICAgICBpZiAoY2hpbGQtPnBsYXRmb3JtV2lkZ2V0KCkpCiAgICAgICAgIHBsYXRmb3JtUmVt b3ZlQ2hpbGQoY2hpbGQpOwogfQorI2VuZGlmCiAKIHZvaWQgU2Nyb2xsVmlldzo6c2V0SGFzSG9y aXpvbnRhbFNjcm9sbGJhcihib29sIGhhc0JhcikKIHsKQEAgLTEwNjYsMTkgKzEwNjgsMTkgQEAg dm9pZCBTY3JvbGxWaWV3OjpzZXRTY3JvbGxPcmlnaW4oY29uc3QgSW50UG9pbnQmIG9yaWdpbiwg Ym9vbCB1cGRhdGVQb3NpdGlvbikKICAgICAgICAgdXBkYXRlU2Nyb2xsYmFycyhzY3JvbGxPZmZz ZXQoKSk7CiB9CiAKLSNpZiAhUExBVEZPUk0oV1gpICYmICFQTEFURk9STShHVEspICYmICFQTEFU Rk9STShFRkwpCi0KIHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1Jbml0KCkKIHsKIH0KIAorI2lm ICFQTEFURk9STShXWCkgJiYgIVBMQVRGT1JNKEdUSykgJiYgIVBMQVRGT1JNKEVGTCkKKwogdm9p ZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybURlc3Ryb3koKQogewogfQogCiAjZW5kaWYKIAotI2lmICFQ TEFURk9STShXWCkgJiYgIVBMQVRGT1JNKEdUSykgJiYgIVBMQVRGT1JNKFFUKSAmJiAhUExBVEZP Uk0oTUFDKQorI2lmICFQTEFURk9STShXWCkgJiYgIVBMQVRGT1JNKFFUKSAmJiAhUExBVEZPUk0o TUFDKQogCiB2b2lkIFNjcm9sbFZpZXc6OnBsYXRmb3JtQWRkQ2hpbGQoV2lkZ2V0KikKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9NYWluRnJhbWVTY3JvbGxiYXJH dGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL01haW5GcmFtZVNjcm9sbGJhckd0 ay5jcHAKaW5kZXggYzJlMjRlMDczNzYyNmJjMmYzYTM0Mjk5YmU3OTdhYTY4NTdlMGEyYy4uYmQw OWJiYjRkOTk3YTlkYzQwMDYxYWQzYzlmNDQzYmU2OGQ3NDIxYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL01haW5GcmFtZVNjcm9sbGJhckd0ay5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL01haW5GcmFtZVNjcm9sbGJhckd0ay5jcHAKQEAgLTU5 LDYgKzU5LDkgQEAgTWFpbkZyYW1lU2Nyb2xsYmFyR3RrOjp+TWFpbkZyYW1lU2Nyb2xsYmFyR3Rr KCkKIAogdm9pZCBNYWluRnJhbWVTY3JvbGxiYXJHdGs6OmF0dGFjaEFkanVzdG1lbnQoR3RrQWRq dXN0bWVudCogYWRqdXN0bWVudCkKIHsKKyAgICBpZiAobV9hZGp1c3RtZW50LmdldCgpID09IGFk anVzdG1lbnQpCisgICAgICAgIHJldHVybjsKKwogICAgIGlmIChtX2FkanVzdG1lbnQpCiAgICAg ICAgIGRldGFjaEFkanVzdG1lbnQoKTsKIApAQCAtNjYsOSArNjksMTAgQEAgdm9pZCBNYWluRnJh bWVTY3JvbGxiYXJHdGs6OmF0dGFjaEFkanVzdG1lbnQoR3RrQWRqdXN0bWVudCogYWRqdXN0bWVu dCkKICAgICBpZiAoIW1fYWRqdXN0bWVudCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZ19zaWdu YWxfY29ubmVjdChtX2FkanVzdG1lbnQuZ2V0KCksICJ2YWx1ZS1jaGFuZ2VkIiwgR19DQUxMQkFD SyhNYWluRnJhbWVTY3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCksIHRoaXMpOwogICAgIHVw ZGF0ZVRodW1iUHJvcG9ydGlvbigpOwogICAgIHVwZGF0ZVRodW1iUG9zaXRpb24oKTsKKyAgICBn X3NpZ25hbF9jb25uZWN0KG1fYWRqdXN0bWVudC5nZXQoKSwgInZhbHVlLWNoYW5nZWQiLCBHX0NB TExCQUNLKE1haW5GcmFtZVNjcm9sbGJhckd0azo6Z3RrVmFsdWVDaGFuZ2VkKSwgdGhpcyk7CisK IH0KIAogdm9pZCBNYWluRnJhbWVTY3JvbGxiYXJHdGs6OmRldGFjaEFkanVzdG1lbnQoKQpAQCAt MTA4LDcgKzExMiw5IEBAIHZvaWQgTWFpbkZyYW1lU2Nyb2xsYmFyR3RrOjp1cGRhdGVUaHVtYlBy b3BvcnRpb24oKQogCiB2b2lkIE1haW5GcmFtZVNjcm9sbGJhckd0azo6Z3RrVmFsdWVDaGFuZ2Vk KEd0a0FkanVzdG1lbnQqLCBNYWluRnJhbWVTY3JvbGxiYXJHdGsqIHRoYXQpCiB7Ci0gICAgdGhh dC0+c2V0VmFsdWUoc3RhdGljX2Nhc3Q8aW50PihndGtfYWRqdXN0bWVudF9nZXRfdmFsdWUodGhh dC0+bV9hZGp1c3RtZW50LmdldCgpKSksIE5vdEZyb21TY3JvbGxBbmltYXRvcik7CisgICAgaW50 IG5ld1ZhbHVlID0gc3RhdGljX2Nhc3Q8aW50PihndGtfYWRqdXN0bWVudF9nZXRfdmFsdWUodGhh dC0+bV9hZGp1c3RtZW50LmdldCgpKSk7CisgICAgaWYgKG5ld1ZhbHVlICE9IHRoYXQtPnZhbHVl KCkpCisgICAgICAgIHRoYXQtPnNldFZhbHVlKG5ld1ZhbHVlLCBOb3RGcm9tU2Nyb2xsQW5pbWF0 b3IpOwogfQogCiB2b2lkIE1haW5GcmFtZVNjcm9sbGJhckd0azo6cGFpbnQoR3JhcGhpY3NDb250 ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1Njcm9sbFZpZXdHdGsuY3BwCmluZGV4IGE4Yzc1NjJmZmMzOGE4YTMwZWQwYTY5 ZWJmOTVmOGZmMDg3ZjY5ZTIuLmRmYTAwMDQ0ODg5YWI0ZWY3OWI1ZWQzZTBmOWI3ZTVmNmZmOGE5 N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3Rr LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAK QEAgLTUxLDEwICs1MSw2IEBAIHVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAotdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybUluaXQoKQotewotfQotCiB2b2lkIFNj cm9sbFZpZXc6OnBsYXRmb3JtRGVzdHJveSgpCiB7CiAgICAgbV9ob3Jpem9udGFsQWRqdXN0bWVu dCA9IDA7CkBAIC03OCw2ICs3NCwyMSBAQCBQYXNzUmVmUHRyPFNjcm9sbGJhcj4gU2Nyb2xsVmll dzo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uIG9yaWVudGF0aQogICAgIHJl dHVybiBNYWluRnJhbWVTY3JvbGxiYXJHdGs6OmNyZWF0ZSh0aGlzLCBvcmllbnRhdGlvbiwgbV92 ZXJ0aWNhbEFkanVzdG1lbnQuZ2V0KCkpOwogfQogCit2b2lkIFNjcm9sbFZpZXc6OnJlbW92ZUNo aWxkKFdpZGdldCogY2hpbGQpCit7CisgICAgQVNTRVJUKGNoaWxkLT5wYXJlbnQoKSA9PSB0aGlz KTsKKyAgICBjaGlsZC0+c2V0UGFyZW50KDApOworICAgIG1fY2hpbGRyZW4ucmVtb3ZlKGNoaWxk KTsKKworICAgIC8vIFdlIG5lZWQgdG8gb3ZlcnJpZGUgdGhlIHZlcnNpb24gb2YgU2Nyb2xsVmll dzo6cmVtb3ZlQ2hpbGQgaW4gU2Nyb2xsVmlldy5jcHAgYmVjYXVzZQorICAgIC8vIHdlIG11c3Qg dG8gaW5mb3JtIG1haW4gZnJhbWUgc2Nyb2xsYmFycyB0aGF0IHRoZWlyIGFkanVzdG1lbnRzIG5v IGxvbmdlciBjb250cm9sIHRoZQorICAgIC8vIG1haW4gZnJhbWUgc2Nyb2xsYmFycy4gV2UgY2Fu bm90IHVzZSBwbGF0Zm9ybVJlbW92ZUNoaWxkIGZvciB0aGlzIHRhc2ssIGJlY2F1c2UgZXZlbgor ICAgIC8vIHRoZXNlIG5hdGl2ZSBzY3JvbGxiYXJzIGRvIG5vdCBoYXZlIGEgcGxhdGZvcm0gd2lk Z2V0IChhIEd0a0FkanVzdG1lbnQgaXMgbm90IGEgR3RrV2lkZ2V0KS4KKyAgICBpZiAocGFyZW50 KCkgfHwgKGNoaWxkICE9IGhvcml6b250YWxTY3JvbGxiYXIoKSkgJiYgKGNoaWxkICE9IHZlcnRp Y2FsU2Nyb2xsYmFyKCkpKQorICAgICAgICByZXR1cm47CisgICAgc3RhdGljX2Nhc3Q8TWFpbkZy YW1lU2Nyb2xsYmFyR3RrKj4oY2hpbGQpLT5kZXRhY2hBZGp1c3RtZW50KCk7Cit9CisKIHZvaWQg U2Nyb2xsVmlldzo6c2V0SG9yaXpvbnRhbEFkanVzdG1lbnQoR3RrQWRqdXN0bWVudCogaGFkaiwg Ym9vbCByZXNldFZhbHVlcykKIHsKICAgICBBU1NFUlQoIXBhcmVudCgpIHx8ICFoYWRqKTsKQEAg LTE2MiwxNCArMTczLDYgQEAgdm9pZCBTY3JvbGxWaWV3OjpzZXRHdGtBZGp1c3RtZW50cyhHdGtB ZGp1c3RtZW50KiBoYWRqLCBHdGtBZGp1c3RtZW50KiB2YWRqLCBib28KICAgICBzZXRWZXJ0aWNh bEFkanVzdG1lbnQodmFkaiwgcmVzZXRWYWx1ZXMpOwogfQogCi12b2lkIFNjcm9sbFZpZXc6OnBs YXRmb3JtQWRkQ2hpbGQoV2lkZ2V0KiBjaGlsZCkKLXsKLX0KLQotdm9pZCBTY3JvbGxWaWV3Ojpw bGF0Zm9ybVJlbW92ZUNoaWxkKFdpZGdldCogY2hpbGQpCi17Ci19Ci0KIEludFJlY3QgU2Nyb2xs Vmlldzo6dmlzaWJsZUNvbnRlbnRSZWN0KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0CiB7 CiAgICAgLy8gSWYgd2UgYXJlIGFuIGludGVyaW9yIGZyYW1lIHNjcm9sbGJhciBvciBhcmUgaW4g c29tZSBzb3J0IG9mIHRyYW5zaXRpb24K 79143 2011-01-17 02:04:19 -0800 2011-02-22 13:02:19 -0800 Patch bug-49177-20110117020419.patch text/plain 5769 mrobinson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZWIwOTBjMTk0MDhmODlhNmI5YTRhMmZjODJlZDE5MDVmNWRkOTljLi5lZjZkMTdh NjJkOWYyNDlmZWMyY2Q2NDkyNzBjZGMzMTk1Yjk3NTU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAK KzIwMTEtMDEtMTcgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHVEtdIGZhc3Qv ZXZlbnRzL3Njcm9sbC1hZnRlci1jbGljay1vbi10YWItaW5kZXggaGFzIGJlZW4gZmFpbGluZyBv biB0aGUgYm90cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NDkxNzcKKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9Ta2lwcGVkOiBVbnNraXAgcGFzc2lu ZyB0ZXN0LgorCiAyMDExLTAxLTE3ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlh LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzU5MTQuCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2d0ay9Ta2lwcGVkCmluZGV4IDFjZjg0NjIyYjhjN2Y1ODJhMjA2OTdlNzZlZTU5YWRjZjI0 MjhjZjYuLjBmNzY0ZDdhNjY1MWE1MmRjZGExYjRkNDdkOTRlMmFjM2NiNjgxYzEgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC01NTIyLDkgKzU1MjIsNiBAQCBmYXN0L2ZyYW1lcy9tZXRh LXJlZnJlc2gtdXNlci1nZXN0dXJlLmh0bWwKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ5MDUyCiBmYXN0L2NhbnZhcy9wb2ludEluUGF0aC5odG1sCiAKLSMgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5MTc3Ci1mYXN0L2V2ZW50cy9z Y3JvbGwtYWZ0ZXItY2xpY2stb24tdGFiLWluZGV4Lmh0bWwKLQogIyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkxNzkKIGFuaW1hdGlvbnMvc3RvcC1hbmltYXRpb24t b24tc3VzcGVuZC5odG1sCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBi L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjOTRjNzRjM2I5YWEzNmRjMDYxNzlmOTFk MzI5MDgzODg0OTgxNWJmLi4wNDk2MDA1ZTU5NmYwYmFjZWNkODdjZmE1MGFlNjFmNTMyZjE5ZDUy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDEtMTcgIE1hcnRpbiBSb2JpbnNv biAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFtHVEtdIGZhc3QvZXZlbnRzL3Njcm9sbC1hZnRlci1jbGljay1v bi10YWItaW5kZXggaGFzIGJlZW4gZmFpbGluZyBvbiB0aGUgYm90cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDkxNzcKKworICAgICAgICAqIHBsYXRm b3JtL1Njcm9sbFZpZXcuY3BwOiBSZW1vdmUgdGhlIEdUSysgZ3VhcmRzIGFyb3VuZCB0aGUgaW1w bGVtZW50YXRpb24KKyAgICAgICAgb2YgcGxhdGZvcm1BZGRDaGlsZCBhbmQgcGxhdGZvcm1SZW1v dmVDaGlsZC4gVGhpcyBjb2RlIGNhbiBiZSBzaGFyZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3Rr L01haW5GcmFtZVNjcm9sbGJhckd0ay5jcHA6CisgICAgICAgIChNYWluRnJhbWVTY3JvbGxiYXJH dGs6OmF0dGFjaEFkanVzdG1lbnQpOiBQcmV2ZW50IHJlLWF0dGFjaGluZyBhbiBhbHJlYWR5IGF0 dGFjaGVkCisgICAgICAgIGFkanVzdG1lbnQuIENvbm5lY3QgdGhlIGFkanVzdG1lbnQgdmFsdWUt Y2hhbmdlZCBzaWduYWwgaGFuZGxlciBhZnRlciByZXNldHRpbmcgdGhlCisgICAgICAgIGFkanVz dG1lbnQuIFRoaXMgcHJldmVudHMgdGhlIHJlc3QgZnJvbSBzdG9tcGluZyBvbiBwcmUtZXhpc3Rp bmcgV2ViQ29yZSB2YWx1ZXMuCisgICAgICAgIChNYWluRnJhbWVTY3JvbGxiYXJHdGs6Omd0a1Zh bHVlQ2hhbmdlZCk6IElmIHRoZSBzY3JvbGxiYXIgaXMgbm8gbG9uZ2VyIGF0dGFjaGVkIHRvCisg ICAgICAgIGEgc2Nyb2xsdmlldyBkbyBub3QgbGlzdGluZyBmb3IgdmFsdWUgY2hhbmdlcy4gVGhl c2Ugc2Nyb2xsYmFycyBhcmUgZGVmdW5jdC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2Nyb2xs Vmlld0d0ay5jcHA6IFJlbW92ZSBkdXBsaWNhdGVkIGVtcHR5IG1ldGhvZHMuCisKIDIwMTEtMDEt MTcgIE5vJ2FtIFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5kZXggNmNmMTNhNDk2Y2M0NWRiZWNlNzQxOWNlNjE3NjM4 Y2ViODJlOGUzNS4uMDJlMzBmM2MwZjc2YTdlMjczMDdhYjA3NDJiMDNhMjdjMjdlYWJlNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKQEAgLTEwNzgsNyArMTA3OCw3IEBA IHZvaWQgU2Nyb2xsVmlldzo6cGxhdGZvcm1EZXN0cm95KCkKIAogI2VuZGlmCiAKLSNpZiAhUExB VEZPUk0oV1gpICYmICFQTEFURk9STShHVEspICYmICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JN KE1BQykKKyNpZiAhUExBVEZPUk0oV1gpICYmICFQTEFURk9STShRVCkgJiYgIVBMQVRGT1JNKE1B QykKIAogdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybUFkZENoaWxkKFdpZGdldCopCiB7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvTWFpbkZyYW1lU2Nyb2xsYmFyR3Rr LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9NYWluRnJhbWVTY3JvbGxiYXJHdGsu Y3BwCmluZGV4IGMyZTI0ZTA3Mzc2MjZiYzJmM2EzNDI5OWJlNzk3YWE2ODU3ZTBhMmMuLmI1NTU3 NWY1ZDRjZDY2NzY5ZjE1NzFjODk4MDJlNmU3ZTYwZmZlNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9NYWluRnJhbWVTY3JvbGxiYXJHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9NYWluRnJhbWVTY3JvbGxiYXJHdGsuY3BwCkBAIC01OSw2 ICs1OSw4IEBAIE1haW5GcmFtZVNjcm9sbGJhckd0azo6fk1haW5GcmFtZVNjcm9sbGJhckd0aygp CiAKIHZvaWQgTWFpbkZyYW1lU2Nyb2xsYmFyR3RrOjphdHRhY2hBZGp1c3RtZW50KEd0a0FkanVz dG1lbnQqIGFkanVzdG1lbnQpCiB7CisgICAgaWYgKG1fYWRqdXN0bWVudC5nZXQoKSA9PSBhZGp1 c3RtZW50KQorICAgICAgICByZXR1cm47CiAgICAgaWYgKG1fYWRqdXN0bWVudCkKICAgICAgICAg ZGV0YWNoQWRqdXN0bWVudCgpOwogCkBAIC02Niw5ICs2OCw5IEBAIHZvaWQgTWFpbkZyYW1lU2Ny b2xsYmFyR3RrOjphdHRhY2hBZGp1c3RtZW50KEd0a0FkanVzdG1lbnQqIGFkanVzdG1lbnQpCiAg ICAgaWYgKCFtX2FkanVzdG1lbnQpCiAgICAgICAgIHJldHVybjsKIAotICAgIGdfc2lnbmFsX2Nv bm5lY3QobV9hZGp1c3RtZW50LmdldCgpLCAidmFsdWUtY2hhbmdlZCIsIEdfQ0FMTEJBQ0soTWFp bkZyYW1lU2Nyb2xsYmFyR3RrOjpndGtWYWx1ZUNoYW5nZWQpLCB0aGlzKTsKICAgICB1cGRhdGVU aHVtYlByb3BvcnRpb24oKTsKICAgICB1cGRhdGVUaHVtYlBvc2l0aW9uKCk7CisgICAgZ19zaWdu YWxfY29ubmVjdChtX2FkanVzdG1lbnQuZ2V0KCksICJ2YWx1ZS1jaGFuZ2VkIiwgR19DQUxMQkFD SyhNYWluRnJhbWVTY3JvbGxiYXJHdGs6Omd0a1ZhbHVlQ2hhbmdlZCksIHRoaXMpOwogfQogCiB2 b2lkIE1haW5GcmFtZVNjcm9sbGJhckd0azo6ZGV0YWNoQWRqdXN0bWVudCgpCkBAIC0xMDgsNyAr MTEwLDE3IEBAIHZvaWQgTWFpbkZyYW1lU2Nyb2xsYmFyR3RrOjp1cGRhdGVUaHVtYlByb3BvcnRp b24oKQogCiB2b2lkIE1haW5GcmFtZVNjcm9sbGJhckd0azo6Z3RrVmFsdWVDaGFuZ2VkKEd0a0Fk anVzdG1lbnQqLCBNYWluRnJhbWVTY3JvbGxiYXJHdGsqIHRoYXQpCiB7Ci0gICAgdGhhdC0+c2V0 VmFsdWUoc3RhdGljX2Nhc3Q8aW50PihndGtfYWRqdXN0bWVudF9nZXRfdmFsdWUodGhhdC0+bV9h ZGp1c3RtZW50LmdldCgpKSksIE5vdEZyb21TY3JvbGxBbmltYXRvcik7CisgICAgLy8gSWYgd2Un dmUgYmVlbiByZW1vdmVkIGZyb20gb3VyIHBhcmVudCwgd2Ugbm8gbG9uZ2VyIGdldCB0byBjb250 cm9sIHRoZSBXZWJDb3JlCisgICAgLy8gc2Nyb2xsYmFyLiBJZiB0aGlzIGlzIHRoZSBjYXNlLCBk ZWFjdGl2YXRlIHRoaXMgc2lnbmFsIGhhbmRsZXIuIFdlYkNvcmUgd2lsbAorICAgIC8vIGNyZWF0 ZSBhIGZyZXNoIE1haW5GcmFtZVNjcm9sbGJhciB3aGVuIHRoZSBzY3JvbGxiYXIgcmVhcHBlYXJz LgorICAgIGlmICghdGhhdC0+cGFyZW50KCkpIHsKKyAgICAgICAgdGhhdC0+ZGV0YWNoQWRqdXN0 bWVudCgpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaW50IG5ld1ZhbHVlID0gc3Rh dGljX2Nhc3Q8aW50PihndGtfYWRqdXN0bWVudF9nZXRfdmFsdWUodGhhdC0+bV9hZGp1c3RtZW50 LmdldCgpKSk7CisgICAgaWYgKG5ld1ZhbHVlICE9IHRoYXQtPnZhbHVlKCkpCisgICAgICAgIHRo YXQtPnNldFZhbHVlKG5ld1ZhbHVlLCBOb3RGcm9tU2Nyb2xsQW5pbWF0b3IpOwogfQogCiB2b2lk IE1haW5GcmFtZVNjcm9sbGJhckd0azo6cGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBj b25zdCBJbnRSZWN0JiByZWN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL1Njcm9sbFZpZXdHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1Njcm9s bFZpZXdHdGsuY3BwCmluZGV4IGE4Yzc1NjJmZmMzOGE4YTMwZWQwYTY5ZWJmOTVmOGZmMDg3ZjY5 ZTIuLmQzYTUyNzg3NzY4MzE5NTI2OTNhNzg4MTU1NjYxZjM4ODE3MDkxZDYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9TY3JvbGxWaWV3R3RrLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvU2Nyb2xsVmlld0d0ay5jcHAKQEAgLTE2MiwxNCArMTYy LDYgQEAgdm9pZCBTY3JvbGxWaWV3OjpzZXRHdGtBZGp1c3RtZW50cyhHdGtBZGp1c3RtZW50KiBo YWRqLCBHdGtBZGp1c3RtZW50KiB2YWRqLCBib28KICAgICBzZXRWZXJ0aWNhbEFkanVzdG1lbnQo dmFkaiwgcmVzZXRWYWx1ZXMpOwogfQogCi12b2lkIFNjcm9sbFZpZXc6OnBsYXRmb3JtQWRkQ2hp bGQoV2lkZ2V0KiBjaGlsZCkKLXsKLX0KLQotdm9pZCBTY3JvbGxWaWV3OjpwbGF0Zm9ybVJlbW92 ZUNoaWxkKFdpZGdldCogY2hpbGQpCi17Ci19Ci0KIEludFJlY3QgU2Nyb2xsVmlldzo6dmlzaWJs ZUNvbnRlbnRSZWN0KGJvb2wgaW5jbHVkZVNjcm9sbGJhcnMpIGNvbnN0CiB7CiAgICAgLy8gSWYg d2UgYXJlIGFuIGludGVyaW9yIGZyYW1lIHNjcm9sbGJhciBvciBhcmUgaW4gc29tZSBzb3J0IG9m IHRyYW5zaXRpb24K