29167 2009-09-10 20:40:34 -0700 REGRESSION (r48064): mint.com loses scrollbars after coming out of edit mode 2010-04-04 20:11:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://www.mint.com InRadar, Regression P2 Normal --- 1 alice.barraclough webkit-unassigned bdakin commit-queue kenneth mark mitz tonikitoo oldest_to_newest 146447 0 alice.barraclough 2009-09-10 20:40:34 -0700 Regression from http://trac.webkit.org/changeset/48064 mint.com loses scrollbars after coming out of edit mode 1) log into mint.com 2) click the edit link to edit your accounts (notice the faded-out background loses scrollbars 3) click the close button in the editing overlay Actual result: the page (which fades in) does not have scrollbars. Expected Result: for the page to regain scrollbars. This happens with r48063 and before. 146449 1 mrowe 2009-09-10 21:03:12 -0700 <rdar://problem/7215132> 146451 2 mark 2009-09-10 21:29:52 -0700 I see this too, and it happens in Chromium as well. This regressed in bug 28614. This bug does not occur with the original v2 patch on that bug. It only occurs with the updated v4 patch, which contained additional fixes for DumpLayoutTree-based layout test regressions that occurred on the Mac only. I'll take a closer look at this tomorrow. 146452 3 39408 mark 2009-09-10 21:38:56 -0700 Created attachment 39408 Possible approach (not for review or checkin) This was a more conservative approach to the test failures in bug 28614 that led to the creation of the v4 patch. I recall testing something like this and finding it satisfactory. It fixes this bug. I'm not sure that it's the right answer and I haven't done much more testing with this other than what I remember doing with similar logic last week, and now visiting mint.com. This needs more inspection, I'll look tomorrow. 160916 4 39408 mitz 2009-11-05 12:15:13 -0800 Comment on attachment 39408 Possible approach (not for review or checkin) The patch does fix bug 30517 as well, and is probably the right approach for now. The only thing I would consider changing is not re-introducing two mode variables but just one “can have scrollbars” boolean, but even that is not really necessary and could be left for a later cleanup pass. If you add the test from bug 30517 (or a different test) and add a change log, I could review the patch. 160918 5 mark 2009-11-05 12:19:44 -0800 OK, I should be able to get to this today or tomorrow. 161067 6 42627 mark 2009-11-05 21:32:02 -0800 Created attachment 42627 Track "can have scrollbar" state within FrameView independently of the individual scrollbar states in ScrollView I started with attachment 39408, which I always thought was more than was necessary to fix this bug, and whittled it away until it contained just the minimum bits needed to get the right behavior. Now that it's done, I see that it's very similar to what mitz came up with in bug 30517 attachment 42576. This does take mitz's suggestion to track "can have scrollbars" as a single boolean instead of tracing m_hmode and m_vmode separately. FrameView shouldn't need to track each scrollbar's on/off/auto mode on its own. The mode tracking belongs in ScrollView, and I got rid of the duplicate mode tracking in FrameView in bug 28614 and was hoping to not have to bring it back to fix this bug. I've run this through the WebKit test suite on the Mac, and have fed it to the Chromium layout test trybots (http://codereview.chromium.org/376009). I've confirmed that it fixes this bug and the attached testcase, and doesn't regress bug 28614. I haven't tested GarageBand from bug 30517, but the testcase from that bug (and in this patch) does the same thing that mint.com does - it sets overflow:hidden and then clears overflow. 161071 7 42627 mitz 2009-11-05 21:54:27 -0800 Comment on attachment 42627 Track "can have scrollbar" state within FrameView independently of the individual scrollbar states in ScrollView I haven’t tested it yet, but based on my experience with bug 30517, I am afraid that this does not fix the GarageBand issue (even though it fixes the test case), the reason being that without calling initScrollbars() from WebFrameView, the FrameView resets to “can have scroll bars” after navigation (which is the real GarageBand scenario; I haven’t been able to recreate it in a layout test). I also think that it’s wrong to name the variable m_canScroll. A frame without scroll bars may still be scrolled programmatically, as a side-effect of find-in-page, and by dragging to select. 161087 8 42634 mark 2009-11-05 23:03:17 -0800 Created attachment 42634 Track "can have scrollbar" state within FrameView independently of the individual scrollbar states in ScrollView This one just has the spelling fix (m_canScroll -> m_canHaveScrollbars). 161090 9 42635 mark 2009-11-05 23:07:03 -0800 Created attachment 42635 With extra logic in resetScrollbars This one has a ilttle extra logic in resetScrollbars to more closely match what the first patch on this bug did. initScrollbars seems like a hack: it was only used by WebFrameView, and only as a one-shot sort of deal. If this still doesn't work with your GarageBand case, we can go in that direction, but it's a little bit difficult for me without a test case or GarageBand to play with. You can test these to see if they do (or don't do) the right thing for GarageBand. This patch does fix the mint.com bug and the testcase, so it's probably worthwhile even if we need to keep hammering away at something for GarageBand. 161095 10 mitz 2009-11-05 23:31:05 -0800 Confirmed that neither patch resolves the issue with GarageBand. I will try to whip up a test app that does what GarageBand does. While there may be a cleaner way to do what the call to initScrollbars() used to do, I would recommend fixing the regression by taking a step backwards (as in attachment 39408), then trying to clean things up after that. 161096 11 42636 mark 2009-11-05 23:42:00 -0800 Created attachment 42636 updateCanHaveScrollbars This is like initScrollbars, but it's called updateCanHaveScrollbars. It should behave roughly the same way. The key difference is that it doesn't do the m_needToInitScrollbars thing. It's hard for me to tell whether that's really necessary, because I can't see who calls -[WebFrameView _install] other than -[WebFrameView _setCustomScrollViewClass:], and I can't see anything that calls that. If we have to, we can go back to keeping m_needToInitScrollbars, but my chief objection with that was that FrameView was keeping state that was really only used for WebFrameView. 161171 12 42636 mitz 2009-11-06 10:46:26 -0800 Comment on attachment 42636 updateCanHaveScrollbars This version fixes bug 30517 as well. I would r+ it. 161179 13 42636 mark 2009-11-06 11:12:56 -0800 Comment on attachment 42636 updateCanHaveScrollbars I'm much happier with this patch than redoing initScrollbars for the reasons stated above. Let's go with this, then. 161186 14 42636 mitz 2009-11-06 11:22:25 -0800 Comment on attachment 42636 updateCanHaveScrollbars Thanks for working on this! I said that I will r+ this patch, but I do have one question and one comment: > ScrollbarMode hMode; > ScrollbarMode vMode; > - scrollbarModes(hMode, vMode); > + if (!m_canHaveScrollbars) { > + hMode = ScrollbarAlwaysOff; > + vMode = ScrollbarAlwaysOff; > + } else { > + scrollbarModes(hMode, vMode); > + if (hMode == ScrollbarAlwaysOff) > + hMode = ScrollbarAuto; > + if (vMode == ScrollbarAlwaysOff) > + vMode = ScrollbarAuto; > + } Can’t you just use m_canHaveScrollbars to choose unconditionally between ScrollbarAlwaysOff and ScrollbarAuto? > - void setCanHaveScrollbars(bool flag); > + virtual void setCanHaveScrollbars(bool flag); You should remove the parameter name from the declaration. As promised, r=me. 161217 15 42665 mark 2009-11-06 11:56:41 -0800 Created attachment 42665 Removed parameter name from declaration Regarding FrameView::layout(): > Can’t you just use m_canHaveScrollbars to choose unconditionally between > ScrollbarAlwaysOff and ScrollbarAuto? I don't think so. The code in here never did that before, it always considered the existing scrollbar state before proceeding. I think that the non-m_firstLayout case depends on this to do the right thing. I didn't check now, but I'm pretty sure that I did try to make this change back when I was working on bug 28614, and that it didn't do the right thing. 161222 16 42666 mark 2009-11-06 12:12:19 -0800 Created attachment 42666 Make FrameView::layout() start at ScrollbarAuto or ScrollbarAlwaysOff without checking the existing ScrollView state OK, I tried this and didn't experience any layout test regressions, so I'm taking mitz's other comment about just setting ScrollbarAuto or ScrollbarAlwaysOff and not asking the ScrollView for the existing scrollbar states. 161247 17 mark 2009-11-06 14:37:35 -0800 I fed the latest patch to the Chromium try bots too, and they also liked it. 161617 18 42666 commit-queue 2009-11-09 09:54:40 -0800 Comment on attachment 42666 Make FrameView::layout() start at ScrollbarAuto or ScrollbarAlwaysOff without checking the existing ScrollView state Clearing flags on attachment: 42666 Committed r50665: <http://trac.webkit.org/changeset/50665> 161618 19 commit-queue 2009-11-09 09:54:45 -0800 All reviewed patches have been landed. Closing bug. 161621 20 mitz 2009-11-09 09:56:28 -0800 *** Bug 30517 has been marked as a duplicate of this bug. *** 161868 21 kenneth 2009-11-09 17:46:50 -0800 Judging from the buildbot, this patch has broken around 100 Qt layout tests. Can someone investigate? 161875 22 mitz 2009-11-09 17:50:12 -0800 (In reply to comment #21) > Judging from the buildbot, this patch has broken around 100 Qt layout tests. > Can someone investigate? Please file a new bug. 39408 2009-09-10 21:38:56 -0700 2009-11-05 21:32:02 -0800 Possible approach (not for review or checkin) 29167.1.patch text/plain 8243 mark SW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dl YkNvcmUuYmFzZS5leHAJKHJldmlzaW9uIDQ4MDY0KQorKysgV2ViQ29yZS9XZWJDb3JlLmJhc2Uu ZXhwCSh3b3JraW5nIGNvcHkpCkBAIC02OTIsNiArNjkyLDcgQEAgX19aTjdXZWJDb3JlOUZyYW1l VHJlZTljbGVhck5hbWVFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzExZm9yY2VMYXlvdXRFYgog X19aTjdXZWJDb3JlOUZyYW1lVmlldzEyc2V0TWVkaWFUeXBlRVJLTlNfNlN0cmluZ0UKIF9fWk43 V2ViQ29yZTlGcmFtZVZpZXcxNGFkanVzdFZpZXdTaXplRXYKK19fWk43V2ViQ29yZTlGcmFtZVZp ZXcxNGluaXRTY3JvbGxiYXJzRXYKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcxNHNldE1hcmdpbldp ZHRoRWkKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcxNHNldE5lZWRzTGF5b3V0RXYKIF9fWk43V2Vi Q29yZTlGcmFtZVZpZXcxNHNldFRyYW5zcGFyZW50RWIKSW5kZXg6IFdlYkNvcmUvV2ViQ29yZS5v cmRlcgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNvcmUub3JkZXIJKHJldmlzaW9uIDQ4MDY0 KQorKysgV2ViQ29yZS9XZWJDb3JlLm9yZGVyCSh3b3JraW5nIGNvcHkpCkBAIC0zMzQsNiArMzM0 LDggQEAgX19aTjdXZWJDb3JlOUZyYW1lVmlldzI5c2V0U2hvdWxkVXBkYXRlVwogX19aTks3V2Vi Q29yZTlGcmFtZVRyZWUxMnRyYXZlcnNlTmV4dEVQS05TXzVGcmFtZUUKIF9fWk43V2ViQ29yZTZX aWRnZXQyMXJlbGVhc2VQbGF0Zm9ybVdpZGdldEV2CiBfX1pON1dlYkNvcmU2V2lkZ2V0MjByZXRh aW5QbGF0Zm9ybVdpZGdldEV2CitfX1pON1dlYkNvcmU5RnJhbWVWaWV3MTRpbml0U2Nyb2xsYmFy c0V2CitfX1pON1dlYkNvcmU5RnJhbWVWaWV3Mjd1cGRhdGVEZWZhdWx0U2Nyb2xsYmFyU3RhdGVF dgogX19aTks3V2ViQ29yZTEwU2Nyb2xsVmlldzE0c2Nyb2xsYmFyTW9kZXNFUk5TXzEzU2Nyb2xs YmFyTW9kZUVTMl8KIF9fWk5LN1dlYkNvcmUxMFNjcm9sbFZpZXcyMnBsYXRmb3JtU2Nyb2xsYmFy TW9kZXNFUk5TXzEzU2Nyb2xsYmFyTW9kZUVTMl8KIF9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzE3 c2V0U2Nyb2xsYmFyTW9kZXNFTlNfMTNTY3JvbGxiYXJNb2RlRVMxXwpAQCAtNTc1Nyw2ICs1NzU5 LDcgQEAgX19aTjNXVEY5SGFzaFRhYmxlSVBON1dlYkNvcmU2V2lkZ2V0RVMzXwogX19aTjNXVEY5 SGFzaFRhYmxlSVBON1dlYkNvcmU2V2lkZ2V0RVMzX05TXzE3SWRlbnRpdHlFeHRyYWN0b3JJUzNf RUVOU183UHRySGFzaElTM19FRU5TXzEwSGFzaFRyYWl0c0lTM19FRVM5X0UxM2FsbG9jYXRlVGFi bGVFaQogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MTZwbGF0Zm9ybUFkZENoaWxkRVBOU182V2lk Z2V0RQogX19aTjdXZWJDb3JlMTZSZW5kZXJQYXJ0T2JqZWN0MTF2aWV3Q2xlYXJlZEV2CitfX1pO N1dlYkNvcmU5RnJhbWVWaWV3MjBzZXRDYW5IYXZlU2Nyb2xsYmFyc0ViCiBfX1pON1dlYkNvcmUx MFNjcm9sbFZpZXcyMHNldENhbkhhdmVTY3JvbGxiYXJzRWIKIF9fWk5LN1dlYkNvcmUxNFNlY3Vy aXR5T3JpZ2luOWNhbkFjY2Vzc0VQS1MwXwogX19aTjNXVEY2VmVjdG9ySU5TXzZSZWZQdHJJTjdX ZWJDb3JlNUZyYW1lRUVFTG0xMEVFNnNocmlua0VtCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWUu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZS5jcHAJKHJldmlzaW9uIDQ4MDY0 KQorKysgV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc5Myw2ICsx NzkzLDcgQEAgdm9pZCBGcmFtZTo6Y3JlYXRlVmlldyhjb25zdCBJbnRTaXplJiB2aQogICAgICAg ICBmcmFtZVZpZXcgPSBGcmFtZVZpZXc6OmNyZWF0ZSh0aGlzKTsKIAogICAgIGZyYW1lVmlldy0+ c2V0U2Nyb2xsYmFyTW9kZXMoaG9yaXpvbnRhbFNjcm9sbGJhck1vZGUsIHZlcnRpY2FsU2Nyb2xs YmFyTW9kZSk7CisgICAgZnJhbWVWaWV3LT51cGRhdGVEZWZhdWx0U2Nyb2xsYmFyU3RhdGUoKTsK IAogICAgIHNldFZpZXcoZnJhbWVWaWV3KTsKIApJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmll dy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9u IDQ4MDY0KQorKysgV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTkzLDEwICs5MywxMyBAQCBzdHJ1Y3QgU2NoZWR1bGVkRXZlbnQgewogCiBGcmFtZVZpZXc6OkZy YW1lVmlldyhGcmFtZSogZnJhbWUpCiAgICAgOiBtX2ZyYW1lKGZyYW1lKQorICAgICwgbV92bW9k ZShTY3JvbGxiYXJBdXRvKQorICAgICwgbV9obW9kZShTY3JvbGxiYXJBdXRvKQogICAgICwgbV9z bG93UmVwYWludE9iamVjdENvdW50KDApCiAgICAgLCBtX2xheW91dFRpbWVyKHRoaXMsICZGcmFt ZVZpZXc6OmxheW91dFRpbWVyRmlyZWQpCiAgICAgLCBtX2xheW91dFJvb3QoMCkKICAgICAsIG1f cG9zdExheW91dFRhc2tzVGltZXIodGhpcywgJkZyYW1lVmlldzo6cG9zdExheW91dFRpbWVyRmly ZWQpCisgICAgLCBtX25lZWRUb0luaXRTY3JvbGxiYXJzKHRydWUpCiAgICAgLCBtX2lzVHJhbnNw YXJlbnQoZmFsc2UpCiAgICAgLCBtX2Jhc2VCYWNrZ3JvdW5kQ29sb3IoQ29sb3I6OndoaXRlKQog ICAgICwgbV9tZWRpYVR5cGUoInNjcmVlbiIpCkBAIC0yMDcsNyArMjEwLDcgQEAgdm9pZCBGcmFt ZVZpZXc6OnJlc2V0U2Nyb2xsYmFycygpCiAgICAgLy8gUmVzZXQgdGhlIGRvY3VtZW50J3Mgc2Ny b2xsYmFycyBiYWNrIHRvIG91ciBkZWZhdWx0cyBiZWZvcmUgd2UgeWllbGQgdGhlIGZsb29yLgog ICAgIG1fZmlyc3RMYXlvdXQgPSB0cnVlOwogICAgIHNldFNjcm9sbGJhcnNTdXBwcmVzc2VkKHRy dWUpOwotICAgIHNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhckF1dG8sIFNjcm9sbGJhckF1dG8p OworICAgIHNldFNjcm9sbGJhck1vZGVzKG1faG1vZGUsIG1fdm1vZGUpOwogICAgIHNldFNjcm9s bGJhcnNTdXBwcmVzc2VkKGZhbHNlKTsKIH0KIApAQCAtMjgxLDYgKzI4NCwyMSBAQCBib29sIEZy YW1lVmlldzo6ZGlkRmlyc3RMYXlvdXQoKSBjb25zdAogICAgIHJldHVybiAhbV9maXJzdExheW91 dDsKIH0KIAordm9pZCBGcmFtZVZpZXc6OmluaXRTY3JvbGxiYXJzKCkKK3sKKyAgICBpZiAoIW1f bmVlZFRvSW5pdFNjcm9sbGJhcnMpCisgICAgICAgIHJldHVybjsKKyAgICBtX25lZWRUb0luaXRT Y3JvbGxiYXJzID0gZmFsc2U7CisgICAgdXBkYXRlRGVmYXVsdFNjcm9sbGJhclN0YXRlKCk7Cit9 CisKK3ZvaWQgRnJhbWVWaWV3Ojp1cGRhdGVEZWZhdWx0U2Nyb2xsYmFyU3RhdGUoKQoreworICAg IG1faG1vZGUgPSBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpOworICAgIG1fdm1vZGUgPSB2ZXJ0 aWNhbFNjcm9sbGJhck1vZGUoKTsKKyAgICBzZXRTY3JvbGxiYXJNb2RlcyhtX2htb2RlLCBtX3Zt b2RlKTsKK30KKwogdm9pZCBGcmFtZVZpZXc6OmludmFsaWRhdGVSZWN0KGNvbnN0IEludFJlY3Qm IHJlY3QpCiB7CiAgICAgaWYgKCFwYXJlbnQoKSkgewpAQCAtMzE0LDYgKzMzMiwyMiBAQCB2b2lk IEZyYW1lVmlldzo6c2V0TWFyZ2luSGVpZ2h0KGludCBoKQogICAgIG1fbWFyZ2lucy5zZXRIZWln aHQoaCk7CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGNh blNjcm9sbCkKK3sKKyAgICBpZiAoIWNhblNjcm9sbCkgeworICAgICAgICBtX2htb2RlID0gU2Ny b2xsYmFyQWx3YXlzT2ZmOworICAgICAgICBtX3Ztb2RlID0gU2Nyb2xsYmFyQWx3YXlzT2ZmOwor ICAgIH0gZWxzZSB7CisgICAgICAgIHNjcm9sbGJhck1vZGVzKG1faG1vZGUsIG1fdm1vZGUpOwor ICAgICAgICBpZiAobV9obW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYpCisgICAgICAgICAgICBt X2htb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAgICAgICAgaWYgKG1fdm1vZGUgPT0gU2Nyb2xsYmFy QWx3YXlzT2ZmKQorICAgICAgICAgICAgbV92bW9kZSA9IFNjcm9sbGJhckF1dG87CisgICAgfQor CisgICAgU2Nyb2xsVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMoY2FuU2Nyb2xsKTsKK30KKwog UGFzc1JlZlB0cjxTY3JvbGxiYXI+IEZyYW1lVmlldzo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJh ck9yaWVudGF0aW9uIG9yaWVudGF0aW9uKQogewogICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIHVw ZGF0ZSB0aGUgc2Nyb2xsYmFyIGR5bmFtaWNhbGx5IGFzIGRvY3VtZW50cyBjaGFuZ2UgKG9yIGFz IGRvYyBlbGVtZW50cyBhbmQgYm9kaWVzIGdldCBkaXNjb3ZlcmVkIHRoYXQgaGF2ZSBjdXN0b20g c3R5bGVzKS4KQEAgLTU1Myw5ICs1ODcsOCBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wg YWxsb3dTdWJ0cmVlCiAKICAgICBtX25lc3RlZExheW91dENvdW50Kys7CiAKLSAgICBTY3JvbGxi YXJNb2RlIGhNb2RlOwotICAgIFNjcm9sbGJhck1vZGUgdk1vZGU7Ci0gICAgc2Nyb2xsYmFyTW9k ZXMoaE1vZGUsIHZNb2RlKTsKKyAgICBTY3JvbGxiYXJNb2RlIGhNb2RlID0gbV9obW9kZTsKKyAg ICBTY3JvbGxiYXJNb2RlIHZNb2RlID0gbV92bW9kZTsKIAogICAgIGlmICghc3VidHJlZSkgewog ICAgICAgICBSZW5kZXJPYmplY3QqIHJvb3RSZW5kZXJlciA9IGRvY3VtZW50LT5kb2N1bWVudEVs ZW1lbnQoKSA/IGRvY3VtZW50LT5kb2N1bWVudEVsZW1lbnQoKS0+cmVuZGVyZXIoKSA6IDA7Cklu ZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCShyZXZpc2lvbiA0ODA2NCkKKysrIFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcu aAkod29ya2luZyBjb3B5KQpAQCAtNjksNiArNjksOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRN YXJnaW5XaWR0aChpbnQpOwogICAgIHZvaWQgc2V0TWFyZ2luSGVpZ2h0KGludCk7CiAKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCk7CisKICAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8U2Nyb2xsYmFyPiBjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24p OwogCiAgICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJik7CkBA IC0xMjAsNiArMTIyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0U2hvdWxkVXBkYXRlV2hpbGVP ZmZzY3JlZW4oYm9vbCk7CiAKICAgICB2b2lkIGFkanVzdFZpZXdTaXplKCk7CisgICAgdm9pZCBp bml0U2Nyb2xsYmFycygpOworICAgIHZvaWQgdXBkYXRlRGVmYXVsdFNjcm9sbGJhclN0YXRlKCk7 CiAgICAgCiAgICAgdmlydHVhbCBJbnRSZWN0IHdpbmRvd0NsaXBSZWN0KGJvb2wgY2xpcFRvQ29u dGVudHMgPSB0cnVlKSBjb25zdDsKICAgICBJbnRSZWN0IHdpbmRvd0NsaXBSZWN0Rm9yTGF5ZXIo Y29uc3QgUmVuZGVyTGF5ZXIqLCBib29sIGNsaXBUb0xheWVyQ29udGVudHMpIGNvbnN0OwpAQCAt MjQ3LDYgKzI1MSw4IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fZG9GdWxsUmVwYWludDsKICAg ICAKKyAgICBTY3JvbGxiYXJNb2RlIG1fdm1vZGU7CisgICAgU2Nyb2xsYmFyTW9kZSBtX2htb2Rl OwogICAgIGJvb2wgbV91c2VTbG93UmVwYWludHM7CiAgICAgYm9vbCBtX2lzT3ZlcmxhcHBlZDsK ICAgICBib29sIG1fY29udGVudElzT3BhcXVlOwpAQCAtMjY2LDYgKzI3Miw3IEBAIHByaXZhdGU6 CiAgICAgYm9vbCBtX2ZpcnN0TGF5b3V0Q2FsbGJhY2tQZW5kaW5nOwogCiAgICAgYm9vbCBtX2Zp cnN0TGF5b3V0OworICAgIGJvb2wgbV9uZWVkVG9Jbml0U2Nyb2xsYmFyczsKICAgICBib29sIG1f aXNUcmFuc3BhcmVudDsKICAgICBDb2xvciBtX2Jhc2VCYWNrZ3JvdW5kQ29sb3I7CiAgICAgSW50 U2l6ZSBtX2xhc3RMYXlvdXRTaXplOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3 LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHJldmlzaW9u IDQ4MDY0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdvcmtpbmcgY29weSkK QEAgLTg5LDcgKzg5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2Nyb2xsYmFyTW9kZXMoU2Nyb2xs YmFyTW9kZSYgaG9yaXpvbnRhbE1vZGUsIFNjcm9sbGJhck1vZGUmIHZlcnRpY2FsTW9kZSkgY29u c3Q7CiAgICAgU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpIGNvbnN0IHsg U2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsLCB2ZXJ0aWNhbDsgc2Nyb2xsYmFyTW9kZXMoaG9yaXpv bnRhbCwgdmVydGljYWwpOyByZXR1cm4gaG9yaXpvbnRhbDsgfQogICAgIFNjcm9sbGJhck1vZGUg dmVydGljYWxTY3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJNb2RlIGhvcml6b250YWws IHZlcnRpY2FsOyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0aWNhbCk7IHJldHVybiB2 ZXJ0aWNhbDsgfQotICAgIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBmbGFnKTsKKyAg ICB2aXJ0dWFsIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBmbGFnKTsKICAgICBib29s IGNhbkhhdmVTY3JvbGxiYXJzKCkgY29uc3QgeyByZXR1cm4gaG9yaXpvbnRhbFNjcm9sbGJhck1v ZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmYgfHwgdmVydGljYWxTY3JvbGxiYXJNb2RlKCkgIT0g U2Nyb2xsYmFyQWx3YXlzT2ZmOyB9CiAKICAgICAvLyBPdmVycmlkZGVuIGJ5IEZyYW1lVmlldyB0 byBjcmVhdGUgY3VzdG9tIENTUyBzY3JvbGxiYXJzIGlmIGFwcGxpY2FibGUuCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMv V2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHJldmlzaW9uIDQ4MDY0KQorKysgV2ViS2l0L21hYy9X ZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw4IEBA IHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBlc0Zyb21DbGFzcyhOU00KICAgICAgICAgb3duZXIt PnNldFdpZGdldCh2aWV3KTsKICAgICAgICAgLy8gTm93IHRoZSByZW5kZXIgcGFydCBvd25zIHRo ZSB2aWV3LCBzbyB3ZSBkb24ndCBhbnkgbW9yZS4KICAgICB9CisKKyAgICB2aWV3LT5pbml0U2Ny b2xsYmFycygpOwogfQogCiBAZW5kCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCShyZXZpc2lvbiA0ODA2 NCkKKysrIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODAx LDExICs4MDEsMTMgQEAgdm9pZCBRV2ViRnJhbWU6OnNldFNjcm9sbEJhclBvbGljeShRdDo6Twog ICAgICAgICBkLT5ob3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5ID0gcG9saWN5OwogICAgICAgICBp ZiAoZC0+ZnJhbWUtPnZpZXcoKSkgewogICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+c2V0 SG9yaXpvbnRhbFNjcm9sbGJhck1vZGUoKFNjcm9sbGJhck1vZGUpcG9saWN5KTsKKyAgICAgICAg ICAgIGQtPmZyYW1lLT52aWV3KCktPnVwZGF0ZURlZmF1bHRTY3JvbGxiYXJTdGF0ZSgpOwogICAg ICAgICB9CiAgICAgfSBlbHNlIHsKICAgICAgICAgZC0+dmVydGljYWxTY3JvbGxCYXJQb2xpY3kg PSBwb2xpY3k7CiAgICAgICAgIGlmIChkLT5mcmFtZS0+dmlldygpKSB7CiAgICAgICAgICAgICBk LT5mcmFtZS0+dmlldygpLT5zZXRWZXJ0aWNhbFNjcm9sbGJhck1vZGUoKFNjcm9sbGJhck1vZGUp cG9saWN5KTsKKyAgICAgICAgICAgIGQtPmZyYW1lLT52aWV3KCktPnVwZGF0ZURlZmF1bHRTY3Jv bGxiYXJTdGF0ZSgpOwogICAgICAgICB9CiAgICAgfQogfQo= 42627 2009-11-05 21:32:02 -0800 2009-11-05 23:03:17 -0800 Track "can have scrollbar" state within FrameView independently of the individual scrollbar states in ScrollView webkit.29167.2.patch text/plain 8103 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDU4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTEtMDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OkZyYW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnJlc2V0U2Nyb2xs YmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldENhbkhhdmVTY3JvbGxiYXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKwogMjAwOS0x MS0wNSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNTA1ODQp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYg KzEwNSw3IEBAIHN0cnVjdCBTY2hlZHVsZWRFdmVudCB7CiAKIEZyYW1lVmlldzo6RnJhbWVWaWV3 KEZyYW1lKiBmcmFtZSkKICAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NhblNjcm9sbCh0 cnVlKQogICAgICwgbV9zbG93UmVwYWludE9iamVjdENvdW50KDApCiAgICAgLCBtX2xheW91dFRp bWVyKHRoaXMsICZGcmFtZVZpZXc6OmxheW91dFRpbWVyRmlyZWQpCiAgICAgLCBtX2xheW91dFJv b3QoMCkKQEAgLTIxOCw2ICsyMTksNyBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXRTY3JvbGxiYXJz KCkKIHsKICAgICAvLyBSZXNldCB0aGUgZG9jdW1lbnQncyBzY3JvbGxiYXJzIGJhY2sgdG8gb3Vy IGRlZmF1bHRzIGJlZm9yZSB3ZSB5aWVsZCB0aGUgZmxvb3IuCiAgICAgbV9maXJzdExheW91dCA9 IHRydWU7CisgICAgbV9jYW5TY3JvbGwgPSB0cnVlOwogICAgIHNldFNjcm9sbGJhcnNTdXBwcmVz c2VkKHRydWUpOwogICAgIHNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhckF1dG8sIFNjcm9sbGJh ckF1dG8pOwogICAgIHNldFNjcm9sbGJhcnNTdXBwcmVzc2VkKGZhbHNlKTsKQEAgLTMxNiw2ICsz MTgsMTIgQEAgdm9pZCBGcmFtZVZpZXc6OnNldE1hcmdpbkhlaWdodChpbnQgaCkKICAgICBtX21h cmdpbnMuc2V0SGVpZ2h0KGgpOwogfQogCit2b2lkIEZyYW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9s bGJhcnMoYm9vbCBjYW5TY3JvbGwpCit7CisgICAgbV9jYW5TY3JvbGwgPSBjYW5TY3JvbGw7Cisg ICAgU2Nyb2xsVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMoY2FuU2Nyb2xsKTsKK30KKwogUGFz c1JlZlB0cjxTY3JvbGxiYXI+IEZyYW1lVmlldzo6Y3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9y aWVudGF0aW9uIG9yaWVudGF0aW9uKQogewogICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIHVwZGF0 ZSB0aGUgc2Nyb2xsYmFyIGR5bmFtaWNhbGx5IGFzIGRvY3VtZW50cyBjaGFuZ2UgKG9yIGFzIGRv YyBlbGVtZW50cyBhbmQgYm9kaWVzIGdldCBkaXNjb3ZlcmVkIHRoYXQgaGF2ZSBjdXN0b20gc3R5 bGVzKS4KQEAgLTU2Miw3ICs1NzAsMTYgQEAgdm9pZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFs bG93U3VidHJlZQogCiAgICAgU2Nyb2xsYmFyTW9kZSBoTW9kZTsKICAgICBTY3JvbGxiYXJNb2Rl IHZNb2RlOwotICAgIHNjcm9sbGJhck1vZGVzKGhNb2RlLCB2TW9kZSk7CisgICAgaWYgKCFtX2Nh blNjcm9sbCkgeworICAgICAgICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKKyAgICAgICAg dk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CisgICAgfSBlbHNlIHsKKyAgICAgICAgc2Nyb2xs YmFyTW9kZXMoaE1vZGUsIHZNb2RlKTsKKyAgICAgICAgaWYgKGhNb2RlID09IFNjcm9sbGJhckFs d2F5c09mZikKKyAgICAgICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAgICAgICAgaWYg KHZNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIHZNb2RlID0gU2Nyb2xs YmFyQXV0bzsKKyAgICB9CiAKICAgICBpZiAoIXN1YnRyZWUpIHsKICAgICAgICAgUmVuZGVyT2Jq ZWN0KiByb290UmVuZGVyZXIgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCkgPyBkb2N1bWVu dC0+ZG9jdW1lbnRFbGVtZW50KCktPnJlbmRlcmVyKCkgOiAwOwpJbmRleDogV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkocmV2 aXNpb24gNTA1ODQpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkK QEAgLTcyLDYgKzcyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0TWFyZ2luV2lkdGgoaW50KTsK ICAgICB2b2lkIHNldE1hcmdpbkhlaWdodChpbnQpOwogCisgICAgdmlydHVhbCB2b2lkIHNldENh bkhhdmVTY3JvbGxiYXJzKGJvb2wpOworCiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFNjcm9sbGJh cj4gY3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uKTsKIAogICAgIHZpcnR1YWwg dm9pZCBzZXRDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYpOwpAQCAtMjU4LDYgKzI2MCw3IEBA IHByaXZhdGU6CiAKICAgICBib29sIG1fZG9GdWxsUmVwYWludDsKICAgICAKKyAgICBib29sIG1f Y2FuU2Nyb2xsOwogICAgIGJvb2wgbV91c2VTbG93UmVwYWludHM7CiAgICAgYm9vbCBtX2lzT3Zl cmxhcHBlZDsKICAgICBib29sIG1fY29udGVudElzT3BhcXVlOwpJbmRleDogV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmgJKHJldmlzaW9uIDUwNTg0KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJ KHdvcmtpbmcgY29weSkKQEAgLTg5LDcgKzg5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2Nyb2xs YmFyTW9kZXMoU2Nyb2xsYmFyTW9kZSYgaG9yaXpvbnRhbE1vZGUsIFNjcm9sbGJhck1vZGUmIHZl cnRpY2FsTW9kZSkgY29uc3Q7CiAgICAgU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsU2Nyb2xsYmFy TW9kZSgpIGNvbnN0IHsgU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsLCB2ZXJ0aWNhbDsgc2Nyb2xs YmFyTW9kZXMoaG9yaXpvbnRhbCwgdmVydGljYWwpOyByZXR1cm4gaG9yaXpvbnRhbDsgfQogICAg IFNjcm9sbGJhck1vZGUgdmVydGljYWxTY3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJN b2RlIGhvcml6b250YWwsIHZlcnRpY2FsOyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0 aWNhbCk7IHJldHVybiB2ZXJ0aWNhbDsgfQotICAgIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMo Ym9vbCBmbGFnKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBm bGFnKTsKICAgICBib29sIGNhbkhhdmVTY3JvbGxiYXJzKCkgY29uc3QgeyByZXR1cm4gaG9yaXpv bnRhbFNjcm9sbGJhck1vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmYgfHwgdmVydGljYWxTY3Jv bGxiYXJNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmOyB9CiAKICAgICAvLyBPdmVycmlkZGVu IGJ5IEZyYW1lVmlldyB0byBjcmVhdGUgY3VzdG9tIENTUyBzY3JvbGxiYXJzIGlmIGFwcGxpY2Fi bGUuCkluZGV4OiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA1MDU4NikKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDA5LTExLTA1ICBNYXJrIE1lbnRvdmFp ICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTY3CisgICAgICAgIFJFR1JFU1NJT04gKHI0ODA2NCk6 IG1pbnQuY29tIGxvc2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91dCBvZgorICAgICAgICBl ZGl0IG1vZGUuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3CisgICAgICAgIFJFR1JFU1NJT04gKHI0 ODA2NCk6IEV4dHJhIHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQgTGVzc29uIFN0b3JlLgorCisg ICAgICAgICogZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sOiBB ZGRlZC4KKwogMjAwOS0xMS0wNSAgQWxpY2UgTGl1ICA8YWxpY2UubGl1QGFwcGxlLmNvbT4KIAog ICAgICAgICBBZGRpbmcgYSByZXNvdXJjZSB0aGF0IHNlZW1zIHRvIGJlIG1pc3NpbmcuICBXaXRo b3V0IGl0LCBzZXZlcmFsIHRlc3RzIGluCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93 L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhw ZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDUgQEAKK1Rlc3QgZm9yIHJkYXI6Ly9w cm9ibGVtLzcyMTUxMzIsIGJ1ZyAyOTE2NywgUkVHUkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20g bG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9mIGVkaXQgbW9kZSwgYW5kIHJkYXI6 Ly9wcm9ibGVtLzczMTQ0MjEsIGJ1ZyAzMDUxNywgUkVHUkVTU0lPTiAocjQ4MDY0KTogRXh0cmEg c2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBMZXNzb24gU3RvcmUuCisKK1RoaXMgdGVzdHMgdGhh dCBhZnRlciBzZXR0aW5nICdvdmVyZmxvdycgb24gdGhlIGRvY3VtZW50IGVsZW1lbnQgdG8gJ2hp ZGRlbicgYW5kIGJhY2sgdG8gJ3Zpc2libGUnLCBzY3JvbGxiYXJzIGFwcGVhciBhcyBuZWNlc3Nh cnkuCisKK1BBU1MKClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZs b3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dApfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46 ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9z Y3JvbGxiYXItcmVzdG9yZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVz dHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSwyOSBAQAorPGJvZHk+CisgICAgPHA+CisgICAgICAgIFRlc3QgZm9yIDxpPjxhIGhy ZWY9InJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIiPnJkYXI6Ly9wcm9ibGVtLzcyMTUxMzI8L2E+LAor ICAgICAgICA8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjkxNjciPmJ1ZyAyOTE2NzwvYT4sCisgICAgICAgIFJFR1JFU1NJT04gKHI0ODA2NCk6IG1pbnQu Y29tIGxvc2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91dCBvZiBlZGl0IG1vZGU8L2k+LAor ICAgICAgICBhbmQgPGk+PGEgaHJlZj0icmRhcjovL3Byb2JsZW0vNzMxNDQyMSI+cmRhcjovL3By b2JsZW0vNzMxNDQyMTwvYT4sCisgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNyI+YnVnIDMwNTE3PC9hPiwKKyAgICAgICAgUkVHUkVT U0lPTiAocjQ4MDY0KTogRXh0cmEgc2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBMZXNzb24gU3Rv cmU8L2k+LgorICAgIDwvcD4KKyAgICA8cD4KKyAgICAgICAgVGhpcyB0ZXN0cyB0aGF0IGFmdGVy IHNldHRpbmcgJ292ZXJmbG93JyBvbiB0aGUgZG9jdW1lbnQgZWxlbWVudCB0bworICAgICAgICAn aGlkZGVuJyBhbmQgYmFjayB0byAndmlzaWJsZScsIHNjcm9sbGJhcnMgYXBwZWFyIGFzIG5lY2Vz c2FyeS4KKyAgICA8L3A+CisgICAgPHAgaWQ9InJlc3VsdCI+RkFJTDogVGVzdCBkaWQgbm90IHJ1 biB0byBjb21wbGV0aW9uPC9wPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpCisgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1w QXNUZXh0KCk7CisKKyAgICAgICAgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LnN0eWxlLm92ZXJm bG93ID0gImhpZGRlbiI7CisgICAgICAgIGRvY3VtZW50LmJvZHkub2Zmc2V0VG9wOworICAgICAg ICBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuc3R5bGUucmVtb3ZlUHJvcGVydHkoIm92ZXJmbG93 Iik7CisgICAgICAgIGRvY3VtZW50LmJvZHkuc3R5bGUuaGVpZ2h0ID0gIjIwMCUiOworICAgICAg ICB2YXIgcmVzdWx0ID0gKGlubmVyV2lkdGggPT09IGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5v ZmZzZXRXaWR0aCkKKyAgICAgICAgICAgID8gIkZBSUw6IFNjcm9sbGJhciBkaWQgbm90IGFwcGVh ciBhZnRlciByZXNldHRpbmcgJ292ZXJmbG93JyIKKyAgICAgICAgICAgIDogIlBBU1MiCisKKyAg ICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInJlc3VsdCIpLmlubmVyVGV4dCA9IHJlc3Vs dDsKKyAgICA8L3NjcmlwdD4KKzwvYm9keT4KClByb3BlcnR5IGNoYW5nZXMgb246IExheW91dFRl c3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRl ZDogc3ZuOm1pbWUtdHlwZQogICArIHRleHQvaHRtbApBZGRlZDogc3ZuOmVvbC1zdHlsZQogICAr IG5hdGl2ZQoK 42634 2009-11-05 23:03:17 -0800 2009-11-06 11:13:07 -0800 Track "can have scrollbar" state within FrameView independently of the individual scrollbar states in ScrollView webkit.29167.3a.patch text/plain 7835 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDU4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTEtMDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OkZyYW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnJlc2V0U2Nyb2xs YmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldENhbkhhdmVTY3JvbGxiYXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKwogMjAwOS0x MS0wNSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNTA1ODQp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYg KzEwNSw3IEBAIHN0cnVjdCBTY2hlZHVsZWRFdmVudCB7CiAKIEZyYW1lVmlldzo6RnJhbWVWaWV3 KEZyYW1lKiBmcmFtZSkKICAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NhbkhhdmVTY3Jv bGxiYXJzKHRydWUpCiAgICAgLCBtX3Nsb3dSZXBhaW50T2JqZWN0Q291bnQoMCkKICAgICAsIG1f bGF5b3V0VGltZXIodGhpcywgJkZyYW1lVmlldzo6bGF5b3V0VGltZXJGaXJlZCkKICAgICAsIG1f bGF5b3V0Um9vdCgwKQpAQCAtMzE2LDYgKzMxNywxMiBAQCB2b2lkIEZyYW1lVmlldzo6c2V0TWFy Z2luSGVpZ2h0KGludCBoKQogICAgIG1fbWFyZ2lucy5zZXRIZWlnaHQoaCk7CiB9CiAKK3ZvaWQg RnJhbWVWaWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGNhbkhhdmVTY3JvbGxiYXJzKQor eworICAgIG1fY2FuSGF2ZVNjcm9sbGJhcnMgPSBjYW5IYXZlU2Nyb2xsYmFyczsKKyAgICBTY3Jv bGxWaWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhjYW5IYXZlU2Nyb2xsYmFycyk7Cit9CisKIFBh c3NSZWZQdHI8U2Nyb2xsYmFyPiBGcmFtZVZpZXc6OmNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJP cmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byB1cGRh dGUgdGhlIHNjcm9sbGJhciBkeW5hbWljYWxseSBhcyBkb2N1bWVudHMgY2hhbmdlIChvciBhcyBk b2MgZWxlbWVudHMgYW5kIGJvZGllcyBnZXQgZGlzY292ZXJlZCB0aGF0IGhhdmUgY3VzdG9tIHN0 eWxlcykuCkBAIC01NjIsNyArNTY5LDE2IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBh bGxvd1N1YnRyZWUKIAogICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7CiAgICAgU2Nyb2xsYmFyTW9k ZSB2TW9kZTsKLSAgICBzY3JvbGxiYXJNb2RlcyhoTW9kZSwgdk1vZGUpOworICAgIGlmICghbV9j YW5IYXZlU2Nyb2xsYmFycykgeworICAgICAgICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsK KyAgICAgICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CisgICAgfSBlbHNlIHsKKyAgICAg ICAgc2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZNb2RlKTsKKyAgICAgICAgaWYgKGhNb2RlID09IFNj cm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAg ICAgICAgaWYgKHZNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIHZNb2Rl ID0gU2Nyb2xsYmFyQXV0bzsKKyAgICB9CiAKICAgICBpZiAoIXN1YnRyZWUpIHsKICAgICAgICAg UmVuZGVyT2JqZWN0KiByb290UmVuZGVyZXIgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCkg PyBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCktPnJlbmRlcmVyKCkgOiAwOwpJbmRleDogV2Vi Q29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVZp ZXcuaAkocmV2aXNpb24gNTA1ODQpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTcyLDYgKzcyLDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0TWFyZ2luV2lk dGgoaW50KTsKICAgICB2b2lkIHNldE1hcmdpbkhlaWdodChpbnQpOwogCisgICAgdmlydHVhbCB2 b2lkIHNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wpOworCiAgICAgdmlydHVhbCBQYXNzUmVmUHRy PFNjcm9sbGJhcj4gY3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uKTsKIAogICAg IHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYpOwpAQCAtMjU4LDYg KzI2MCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fZG9GdWxsUmVwYWludDsKICAgICAKKyAg ICBib29sIG1fY2FuSGF2ZVNjcm9sbGJhcnM7CiAgICAgYm9vbCBtX3VzZVNsb3dSZXBhaW50czsK ICAgICBib29sIG1faXNPdmVybGFwcGVkOwogICAgIGJvb2wgbV9jb250ZW50SXNPcGFxdWU7Cklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24gNTA1ODQpCisrKyBXZWJDb3JlL3BsYXRm b3JtL1Njcm9sbFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODksNyArODksNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJNb2RlJiBob3Jpem9udGFsTW9kZSwg U2Nyb2xsYmFyTW9kZSYgdmVydGljYWxNb2RlKSBjb25zdDsKICAgICBTY3JvbGxiYXJNb2RlIGhv cml6b250YWxTY3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJNb2RlIGhvcml6b250YWws IHZlcnRpY2FsOyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0aWNhbCk7IHJldHVybiBo b3Jpem9udGFsOyB9CiAgICAgU2Nyb2xsYmFyTW9kZSB2ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKSBj b25zdCB7IFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbCwgdmVydGljYWw7IHNjcm9sbGJhck1vZGVz KGhvcml6b250YWwsIHZlcnRpY2FsKTsgcmV0dXJuIHZlcnRpY2FsOyB9Ci0gICAgdm9pZCBzZXRD YW5IYXZlU2Nyb2xsYmFycyhib29sIGZsYWcpOworICAgIHZpcnR1YWwgdm9pZCBzZXRDYW5IYXZl U2Nyb2xsYmFycyhib29sIGZsYWcpOwogICAgIGJvb2wgY2FuSGF2ZVNjcm9sbGJhcnMoKSBjb25z dCB7IHJldHVybiBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09m ZiB8fCB2ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmY7IH0KIAog ICAgIC8vIE92ZXJyaWRkZW4gYnkgRnJhbWVWaWV3IHRvIGNyZWF0ZSBjdXN0b20gQ1NTIHNjcm9s bGJhcnMgaWYgYXBwbGljYWJsZS4KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNTg2KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMDktMTEt MDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MjE1MTMyLCBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNjcKKyAgICAgICAgUkVH UkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcg b3V0IG9mCisgICAgICAgIGVkaXQgbW9kZS4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MzE0 NDIxLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA1MTcKKyAgICAg ICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogRXh0cmEgc2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBM ZXNzb24gU3RvcmUuCisKKyAgICAgICAgKiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3Jl ZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFy LXJlc3RvcmVkLmh0bWw6IEFkZGVkLgorCiAyMDA5LTExLTA1ICBBbGljZSBMaXUgIDxhbGljZS5s aXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZGluZyBhIHJlc291cmNlIHRoYXQgc2VlbXMgdG8g YmUgbWlzc2luZy4gIFdpdGhvdXQgaXQsIHNldmVyYWwgdGVzdHMgaW4KSW5kZXg6IExheW91dFRl c3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9s bGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNSBAQAor VGVzdCBmb3IgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgYnVnIDI5MTY3LCBSRUdSRVNTSU9OIChy NDgwNjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YgZWRp dCBtb2RlLCBhbmQgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgYnVnIDMwNTE3LCBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworVGhpcyB0ZXN0cyB0aGF0IGFmdGVyIHNldHRpbmcgJ292ZXJmbG93JyBvbiB0aGUgZG9jdW1l bnQgZWxlbWVudCB0byAnaGlkZGVuJyBhbmQgYmFjayB0byAndmlzaWJsZScsIHNjcm9sbGJhcnMg YXBwZWFyIGFzIG5lY2Vzc2FyeS4KKworUEFTUwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0 VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0Cl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0 cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwJKHJldmlzaW9u IDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI5IEBACis8Ym9keT4KKyAgICA8cD4KKyAgICAgICAg VGVzdCBmb3IgPGk+PGEgaHJlZj0icmRhcjovL3Byb2JsZW0vNzIxNTEzMiI+cmRhcjovL3Byb2Js ZW0vNzIxNTEzMjwvYT4sCisgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yOTE2NyI+YnVnIDI5MTY3PC9hPiwKKyAgICAgICAgUkVHUkVTU0lP TiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9m IGVkaXQgbW9kZTwvaT4sCisgICAgICAgIGFuZCA8aT48YSBocmVmPSJyZGFyOi8vcHJvYmxlbS83 MzE0NDIxIj5yZGFyOi8vcHJvYmxlbS83MzE0NDIxPC9hPiwKKyAgICAgICAgPGEgaHJlZj0iaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3Ij5idWcgMzA1MTc8L2E+ LAorICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJh Z2VCYW5kIExlc3NvbiBTdG9yZTwvaT4uCisgICAgPC9wPgorICAgIDxwPgorICAgICAgICBUaGlz IHRlc3RzIHRoYXQgYWZ0ZXIgc2V0dGluZyAnb3ZlcmZsb3cnIG9uIHRoZSBkb2N1bWVudCBlbGVt ZW50IHRvCisgICAgICAgICdoaWRkZW4nIGFuZCBiYWNrIHRvICd2aXNpYmxlJywgc2Nyb2xsYmFy cyBhcHBlYXIgYXMgbmVjZXNzYXJ5LgorICAgIDwvcD4KKyAgICA8cCBpZD0icmVzdWx0Ij5GQUlM OiBUZXN0IGRpZCBub3QgcnVuIHRvIGNvbXBsZXRpb248L3A+CisgICAgPHNjcmlwdD4KKyAgICAg ICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRl c3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgICAgICBkb2N1bWVudC5kb2N1bWVudEVs ZW1lbnQuc3R5bGUub3ZlcmZsb3cgPSAiaGlkZGVuIjsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5v ZmZzZXRUb3A7CisgICAgICAgIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5zdHlsZS5yZW1vdmVQ cm9wZXJ0eSgib3ZlcmZsb3ciKTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5zdHlsZS5oZWlnaHQg PSAiMjAwJSI7CisgICAgICAgIHZhciByZXN1bHQgPSAoaW5uZXJXaWR0aCA9PT0gZG9jdW1lbnQu ZG9jdW1lbnRFbGVtZW50Lm9mZnNldFdpZHRoKQorICAgICAgICAgICAgPyAiRkFJTDogU2Nyb2xs YmFyIGRpZCBub3QgYXBwZWFyIGFmdGVyIHJlc2V0dGluZyAnb3ZlcmZsb3cnIgorICAgICAgICAg ICAgOiAiUEFTUyIKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0Iiku aW5uZXJUZXh0ID0gcmVzdWx0OworICAgIDwvc2NyaXB0PgorPC9ib2R5PgoKUHJvcGVydHkgY2hh bmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRt bApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9odG1sCkFkZGVkOiBz dm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgo= 42635 2009-11-05 23:07:03 -0800 2009-11-06 11:13:18 -0800 With extra logic in resetScrollbars webkit.29167.3b.patch text/plain 8303 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDU4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjcgQEAKKzIwMDktMTEtMDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OkZyYW1lVmlldyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnJlc2V0U2Nyb2xs YmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZpZXc6OnNldENhbkhhdmVTY3JvbGxiYXJz KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6bGF5b3V0KToKKyAgICAgICAgKiBwYWdl L0ZyYW1lVmlldy5oOgorICAgICAgICAqIHBsYXRmb3JtL1Njcm9sbFZpZXcuaDoKKwogMjAwOS0x MS0wNSAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNTA1ODQp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYg KzEwNSw3IEBAIHN0cnVjdCBTY2hlZHVsZWRFdmVudCB7CiAKIEZyYW1lVmlldzo6RnJhbWVWaWV3 KEZyYW1lKiBmcmFtZSkKICAgICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NhbkhhdmVTY3Jv bGxiYXJzKHRydWUpCiAgICAgLCBtX3Nsb3dSZXBhaW50T2JqZWN0Q291bnQoMCkKICAgICAsIG1f bGF5b3V0VGltZXIodGhpcywgJkZyYW1lVmlldzo6bGF5b3V0VGltZXJGaXJlZCkKICAgICAsIG1f bGF5b3V0Um9vdCgwKQpAQCAtMjE5LDcgKzIyMCwxMCBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXRT Y3JvbGxiYXJzKCkKICAgICAvLyBSZXNldCB0aGUgZG9jdW1lbnQncyBzY3JvbGxiYXJzIGJhY2sg dG8gb3VyIGRlZmF1bHRzIGJlZm9yZSB3ZSB5aWVsZCB0aGUgZmxvb3IuCiAgICAgbV9maXJzdExh eW91dCA9IHRydWU7CiAgICAgc2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQodHJ1ZSk7Ci0gICAgc2V0 U2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyQXV0bywgU2Nyb2xsYmFyQXV0byk7CisgICAgaWYgKG1f Y2FuSGF2ZVNjcm9sbGJhcnMpCisgICAgICAgIHNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhckF1 dG8sIFNjcm9sbGJhckF1dG8pOworICAgIGVsc2UKKyAgICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMo U2Nyb2xsYmFyQWx3YXlzT2ZmLCBTY3JvbGxiYXJBbHdheXNPZmYpOwogICAgIHNldFNjcm9sbGJh cnNTdXBwcmVzc2VkKGZhbHNlKTsKIH0KIApAQCAtMzE2LDYgKzMyMCwxMiBAQCB2b2lkIEZyYW1l Vmlldzo6c2V0TWFyZ2luSGVpZ2h0KGludCBoKQogICAgIG1fbWFyZ2lucy5zZXRIZWlnaHQoaCk7 CiB9CiAKK3ZvaWQgRnJhbWVWaWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGNhbkhhdmVT Y3JvbGxiYXJzKQoreworICAgIG1fY2FuSGF2ZVNjcm9sbGJhcnMgPSBjYW5IYXZlU2Nyb2xsYmFy czsKKyAgICBTY3JvbGxWaWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhjYW5IYXZlU2Nyb2xsYmFy cyk7Cit9CisKIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBGcmFtZVZpZXc6OmNyZWF0ZVNjcm9sbGJh cihTY3JvbGxiYXJPcmllbnRhdGlvbiBvcmllbnRhdGlvbikKIHsKICAgICAvLyBGSVhNRTogV2Ug bmVlZCB0byB1cGRhdGUgdGhlIHNjcm9sbGJhciBkeW5hbWljYWxseSBhcyBkb2N1bWVudHMgY2hh bmdlIChvciBhcyBkb2MgZWxlbWVudHMgYW5kIGJvZGllcyBnZXQgZGlzY292ZXJlZCB0aGF0IGhh dmUgY3VzdG9tIHN0eWxlcykuCkBAIC01NjIsNyArNTcyLDE2IEBAIHZvaWQgRnJhbWVWaWV3Ojps YXlvdXQoYm9vbCBhbGxvd1N1YnRyZWUKIAogICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7CiAgICAg U2Nyb2xsYmFyTW9kZSB2TW9kZTsKLSAgICBzY3JvbGxiYXJNb2RlcyhoTW9kZSwgdk1vZGUpOwor ICAgIGlmICghbV9jYW5IYXZlU2Nyb2xsYmFycykgeworICAgICAgICBoTW9kZSA9IFNjcm9sbGJh ckFsd2F5c09mZjsKKyAgICAgICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CisgICAgfSBl bHNlIHsKKyAgICAgICAgc2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZNb2RlKTsKKyAgICAgICAgaWYg KGhNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIGhNb2RlID0gU2Nyb2xs YmFyQXV0bzsKKyAgICAgICAgaWYgKHZNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICAg ICAgICAgIHZNb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAgICB9CiAKICAgICBpZiAoIXN1YnRyZWUp IHsKICAgICAgICAgUmVuZGVyT2JqZWN0KiByb290UmVuZGVyZXIgPSBkb2N1bWVudC0+ZG9jdW1l bnRFbGVtZW50KCkgPyBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCktPnJlbmRlcmVyKCkgOiAw OwpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gNTA1ODQpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcyLDggQEAgcHVibGljOgogICAgIHZvaWQg c2V0TWFyZ2luV2lkdGgoaW50KTsKICAgICB2b2lkIHNldE1hcmdpbkhlaWdodChpbnQpOwogCisg ICAgdmlydHVhbCB2b2lkIHNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wpOworCiAgICAgdmlydHVh bCBQYXNzUmVmUHRyPFNjcm9sbGJhcj4gY3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0 aW9uKTsKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c1NpemUoY29uc3QgSW50U2l6ZSYp OwpAQCAtMjU4LDYgKzI2MCw3IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fZG9GdWxsUmVwYWlu dDsKICAgICAKKyAgICBib29sIG1fY2FuSGF2ZVNjcm9sbGJhcnM7CiAgICAgYm9vbCBtX3VzZVNs b3dSZXBhaW50czsKICAgICBib29sIG1faXNPdmVybGFwcGVkOwogICAgIGJvb2wgbV9jb250ZW50 SXNPcGFxdWU7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkocmV2aXNpb24gNTA1ODQpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtODksNyArODks NyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJNb2RlJiBob3Jp em9udGFsTW9kZSwgU2Nyb2xsYmFyTW9kZSYgdmVydGljYWxNb2RlKSBjb25zdDsKICAgICBTY3Jv bGxiYXJNb2RlIGhvcml6b250YWxTY3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJNb2Rl IGhvcml6b250YWwsIHZlcnRpY2FsOyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0aWNh bCk7IHJldHVybiBob3Jpem9udGFsOyB9CiAgICAgU2Nyb2xsYmFyTW9kZSB2ZXJ0aWNhbFNjcm9s bGJhck1vZGUoKSBjb25zdCB7IFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbCwgdmVydGljYWw7IHNj cm9sbGJhck1vZGVzKGhvcml6b250YWwsIHZlcnRpY2FsKTsgcmV0dXJuIHZlcnRpY2FsOyB9Ci0g ICAgdm9pZCBzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGZsYWcpOworICAgIHZpcnR1YWwgdm9p ZCBzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGZsYWcpOwogICAgIGJvb2wgY2FuSGF2ZVNjcm9s bGJhcnMoKSBjb25zdCB7IHJldHVybiBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpICE9IFNjcm9s bGJhckFsd2F5c09mZiB8fCB2ZXJ0aWNhbFNjcm9sbGJhck1vZGUoKSAhPSBTY3JvbGxiYXJBbHdh eXNPZmY7IH0KIAogICAgIC8vIE92ZXJyaWRkZW4gYnkgRnJhbWVWaWV3IHRvIGNyZWF0ZSBjdXN0 b20gQ1NTIHNjcm9sbGJhcnMgaWYgYXBwbGljYWJsZS4KSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNTg2 KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcg QEAKKzIwMDktMTEtMDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVtLm9yZz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByZGFyOi8vcHJvYmxl bS83MjE1MTMyLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNjcK KyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBh ZnRlciBjb21pbmcgb3V0IG9mCisgICAgICAgIGVkaXQgbW9kZS4KKworICAgICAgICByZGFyOi8v cHJvYmxlbS83MzE0NDIxLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzA1MTcKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogRXh0cmEgc2Nyb2xsIGJhcnMgaW4g R2FyYWdlQmFuZCBMZXNzb24gU3RvcmUuCisKKyAgICAgICAgKiBmYXN0L292ZXJmbG93L3Njcm9s bGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3Qvb3ZlcmZs b3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWw6IEFkZGVkLgorCiAyMDA5LTExLTA1ICBBbGljZSBM aXUgIDxhbGljZS5saXVAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZGluZyBhIHJlc291cmNlIHRo YXQgc2VlbXMgdG8gYmUgbWlzc2luZy4gIFdpdGhvdXQgaXQsIHNldmVyYWwgdGVzdHMgaW4KSW5k ZXg6IExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1y ZXN0b3JlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0w LDAgKzEsNSBAQAorVGVzdCBmb3IgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgYnVnIDI5MTY3LCBS RUdSRVNTSU9OIChyNDgwNjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWlu ZyBvdXQgb2YgZWRpdCBtb2RlLCBhbmQgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgYnVnIDMwNTE3 LCBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExl c3NvbiBTdG9yZS4KKworVGhpcyB0ZXN0cyB0aGF0IGFmdGVyIHNldHRpbmcgJ292ZXJmbG93JyBv biB0aGUgZG9jdW1lbnQgZWxlbWVudCB0byAnaGlkZGVuJyBhbmQgYmFjayB0byAndmlzaWJsZScs IHNjcm9sbGJhcnMgYXBwZWFyIGFzIG5lY2Vzc2FyeS4KKworUEFTUwoKUHJvcGVydHkgY2hhbmdl cyBvbjogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0 ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4 OiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0 bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1y ZXN0b3JlZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI5IEBACis8Ym9keT4KKyAgICA8 cD4KKyAgICAgICAgVGVzdCBmb3IgPGk+PGEgaHJlZj0icmRhcjovL3Byb2JsZW0vNzIxNTEzMiI+ cmRhcjovL3Byb2JsZW0vNzIxNTEzMjwvYT4sCisgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NyI+YnVnIDI5MTY3PC9hPiwKKyAgICAg ICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBj b21pbmcgb3V0IG9mIGVkaXQgbW9kZTwvaT4sCisgICAgICAgIGFuZCA8aT48YSBocmVmPSJyZGFy Oi8vcHJvYmxlbS83MzE0NDIxIj5yZGFyOi8vcHJvYmxlbS83MzE0NDIxPC9hPiwKKyAgICAgICAg PGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3Ij5i dWcgMzA1MTc8L2E+LAorICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwg YmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZTwvaT4uCisgICAgPC9wPgorICAgIDxwPgor ICAgICAgICBUaGlzIHRlc3RzIHRoYXQgYWZ0ZXIgc2V0dGluZyAnb3ZlcmZsb3cnIG9uIHRoZSBk b2N1bWVudCBlbGVtZW50IHRvCisgICAgICAgICdoaWRkZW4nIGFuZCBiYWNrIHRvICd2aXNpYmxl Jywgc2Nyb2xsYmFycyBhcHBlYXIgYXMgbmVjZXNzYXJ5LgorICAgIDwvcD4KKyAgICA8cCBpZD0i cmVzdWx0Ij5GQUlMOiBUZXN0IGRpZCBub3QgcnVuIHRvIGNvbXBsZXRpb248L3A+CisgICAgPHNj cmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAg ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKworICAgICAgICBkb2N1bWVu dC5kb2N1bWVudEVsZW1lbnQuc3R5bGUub3ZlcmZsb3cgPSAiaGlkZGVuIjsKKyAgICAgICAgZG9j dW1lbnQuYm9keS5vZmZzZXRUb3A7CisgICAgICAgIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5z dHlsZS5yZW1vdmVQcm9wZXJ0eSgib3ZlcmZsb3ciKTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5z dHlsZS5oZWlnaHQgPSAiMjAwJSI7CisgICAgICAgIHZhciByZXN1bHQgPSAoaW5uZXJXaWR0aCA9 PT0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50Lm9mZnNldFdpZHRoKQorICAgICAgICAgICAgPyAi RkFJTDogU2Nyb2xsYmFyIGRpZCBub3QgYXBwZWFyIGFmdGVyIHJlc2V0dGluZyAnb3ZlcmZsb3cn IgorICAgICAgICAgICAgOiAiUEFTUyIKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgicmVzdWx0IikuaW5uZXJUZXh0ID0gcmVzdWx0OworICAgIDwvc2NyaXB0PgorPC9ib2R5PgoK UHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXIt cmVzdG9yZWQuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9o dG1sCkFkZGVkOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgo= 42636 2009-11-05 23:42:00 -0800 2009-11-07 21:00:30 -0800 updateCanHaveScrollbars webkit.29167.4.patch text/plain 12502 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDU5MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTEtMDUgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBXZWJDb3JlLmJhc2UuZXhwOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6RnJhbWVWaWV3KToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6cmVzZXRTY3JvbGxiYXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3Ojp1cGRhdGVDYW5IYXZlU2Nyb2xsYmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OmxheW91dCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxWaWV3Lmg6CisKIDIwMDktMTEtMDUgIEFscGhhIExhbSAgPGhjbGFtQGNocm9t aXVtLm9yZz4KIAogICAgICAgICBSZXZlcnQgNTA1NjIgYmVjYXVzZSBpdCBicm9rZSBDaHJvbWl1 bS4gTm90IHJldmlld2VkIHNpbmNlIHRoaXMgaXMgYSBidWlsZCBmaXggYW5kIHJldmVydC4KSW5k ZXg6IFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL1dlYkNv cmUuYmFzZS5leHAJKHJldmlzaW9uIDUwNTg0KQorKysgV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhw CSh3b3JraW5nIGNvcHkpCkBAIC02ODgsNiArNjg4LDcgQEAgX19aTjdXZWJDb3JlOUZyYW1lVmll dzIxZmx1c2hEZWZlcnJlZFJlcAogX19aTjdXZWJDb3JlOUZyYW1lVmlldzIxc2Nyb2xsUG9zaXRp b25DaGFuZ2VkRXYKIF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyMnNldEJhc2VCYWNrZ3JvdW5kQ29s b3JFTlNfNUNvbG9yRQogX19aTjdXZWJDb3JlOUZyYW1lVmlldzIzbGF5b3V0SWZOZWVkZWRSZWN1 cnNpdmVFdgorX19aTjdXZWJDb3JlOUZyYW1lVmlldzIzdXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnNF dgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzI5Zm9yY2VMYXlvdXRXaXRoUGFnZVdpZHRoUmFuZ2VF ZmZiCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjlzZXRTaG91bGRVcGRhdGVXaGlsZU9mZnNjcmVl bkViCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjlzeW5jQ29tcG9zaXRpbmdTdGF0ZVJlY3Vyc2l2 ZUV2CkluZGV4OiBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmNwcAkocmV2aXNpb24gNTA1ODQpCisrKyBXZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYgKzEwNSw3IEBAIHN0cnVjdCBT Y2hlZHVsZWRFdmVudCB7CiAKIEZyYW1lVmlldzo6RnJhbWVWaWV3KEZyYW1lKiBmcmFtZSkKICAg ICA6IG1fZnJhbWUoZnJhbWUpCisgICAgLCBtX2NhbkhhdmVTY3JvbGxiYXJzKHRydWUpCiAgICAg LCBtX3Nsb3dSZXBhaW50T2JqZWN0Q291bnQoMCkKICAgICAsIG1fbGF5b3V0VGltZXIodGhpcywg JkZyYW1lVmlldzo6bGF5b3V0VGltZXJGaXJlZCkKICAgICAsIG1fbGF5b3V0Um9vdCgwKQpAQCAt MjE5LDcgKzIyMCwxMCBAQCB2b2lkIEZyYW1lVmlldzo6cmVzZXRTY3JvbGxiYXJzKCkKICAgICAv LyBSZXNldCB0aGUgZG9jdW1lbnQncyBzY3JvbGxiYXJzIGJhY2sgdG8gb3VyIGRlZmF1bHRzIGJl Zm9yZSB3ZSB5aWVsZCB0aGUgZmxvb3IuCiAgICAgbV9maXJzdExheW91dCA9IHRydWU7CiAgICAg c2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQodHJ1ZSk7Ci0gICAgc2V0U2Nyb2xsYmFyTW9kZXMoU2Ny b2xsYmFyQXV0bywgU2Nyb2xsYmFyQXV0byk7CisgICAgaWYgKG1fY2FuSGF2ZVNjcm9sbGJhcnMp CisgICAgICAgIHNldFNjcm9sbGJhck1vZGVzKFNjcm9sbGJhckF1dG8sIFNjcm9sbGJhckF1dG8p OworICAgIGVsc2UKKyAgICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyQWx3YXlzT2Zm LCBTY3JvbGxiYXJBbHdheXNPZmYpOwogICAgIHNldFNjcm9sbGJhcnNTdXBwcmVzc2VkKGZhbHNl KTsKIH0KIApAQCAtMzE2LDYgKzMyMCwyMyBAQCB2b2lkIEZyYW1lVmlldzo6c2V0TWFyZ2luSGVp Z2h0KGludCBoKQogICAgIG1fbWFyZ2lucy5zZXRIZWlnaHQoaCk7CiB9CiAKK3ZvaWQgRnJhbWVW aWV3OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sIGNhbkhhdmVTY3JvbGxiYXJzKQoreworICAg IG1fY2FuSGF2ZVNjcm9sbGJhcnMgPSBjYW5IYXZlU2Nyb2xsYmFyczsKKyAgICBTY3JvbGxWaWV3 OjpzZXRDYW5IYXZlU2Nyb2xsYmFycyhjYW5IYXZlU2Nyb2xsYmFycyk7Cit9CisKK3ZvaWQgRnJh bWVWaWV3Ojp1cGRhdGVDYW5IYXZlU2Nyb2xsYmFycygpCit7CisgICAgU2Nyb2xsYmFyTW9kZSBo TW9kZTsKKyAgICBTY3JvbGxiYXJNb2RlIHZNb2RlOworICAgIHNjcm9sbGJhck1vZGVzKGhNb2Rl LCB2TW9kZSk7CisgICAgaWYgKGhNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZiAmJiB2TW9kZSA9 PSBTY3JvbGxiYXJBbHdheXNPZmYpCisgICAgICAgIG1fY2FuSGF2ZVNjcm9sbGJhcnMgPSBmYWxz ZTsKKyAgICBlbHNlCisgICAgICAgIG1fY2FuSGF2ZVNjcm9sbGJhcnMgPSB0cnVlOworfQorCiBQ YXNzUmVmUHRyPFNjcm9sbGJhcj4gRnJhbWVWaWV3OjpjcmVhdGVTY3JvbGxiYXIoU2Nyb2xsYmFy T3JpZW50YXRpb24gb3JpZW50YXRpb24pCiB7CiAgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gdXBk YXRlIHRoZSBzY3JvbGxiYXIgZHluYW1pY2FsbHkgYXMgZG9jdW1lbnRzIGNoYW5nZSAob3IgYXMg ZG9jIGVsZW1lbnRzIGFuZCBib2RpZXMgZ2V0IGRpc2NvdmVyZWQgdGhhdCBoYXZlIGN1c3RvbSBz dHlsZXMpLgpAQCAtNTYyLDcgKzU4MywxNiBAQCB2b2lkIEZyYW1lVmlldzo6bGF5b3V0KGJvb2wg YWxsb3dTdWJ0cmVlCiAKICAgICBTY3JvbGxiYXJNb2RlIGhNb2RlOwogICAgIFNjcm9sbGJhck1v ZGUgdk1vZGU7Ci0gICAgc2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZNb2RlKTsKKyAgICBpZiAoIW1f Y2FuSGF2ZVNjcm9sbGJhcnMpIHsKKyAgICAgICAgaE1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7 CisgICAgICAgIHZNb2RlID0gU2Nyb2xsYmFyQWx3YXlzT2ZmOworICAgIH0gZWxzZSB7CisgICAg ICAgIHNjcm9sbGJhck1vZGVzKGhNb2RlLCB2TW9kZSk7CisgICAgICAgIGlmIChoTW9kZSA9PSBT Y3JvbGxiYXJBbHdheXNPZmYpCisgICAgICAgICAgICBoTW9kZSA9IFNjcm9sbGJhckF1dG87Cisg ICAgICAgIGlmICh2TW9kZSA9PSBTY3JvbGxiYXJBbHdheXNPZmYpCisgICAgICAgICAgICB2TW9k ZSA9IFNjcm9sbGJhckF1dG87CisgICAgfQogCiAgICAgaWYgKCFzdWJ0cmVlKSB7CiAgICAgICAg IFJlbmRlck9iamVjdCogcm9vdFJlbmRlcmVyID0gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgp ID8gZG9jdW1lbnQtPmRvY3VtZW50RWxlbWVudCgpLT5yZW5kZXJlcigpIDogMDsKSW5kZXg6IFdl YkNvcmUvcGFnZS9GcmFtZVZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BhZ2UvRnJhbWVW aWV3LmgJKHJldmlzaW9uIDUwNTg0KQorKysgV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC03Miw2ICs3Miw5IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldE1hcmdpbldp ZHRoKGludCk7CiAgICAgdm9pZCBzZXRNYXJnaW5IZWlnaHQoaW50KTsKIAorICAgIHZpcnR1YWwg dm9pZCBzZXRDYW5IYXZlU2Nyb2xsYmFycyhib29sKTsKKyAgICB2b2lkIHVwZGF0ZUNhbkhhdmVT Y3JvbGxiYXJzKCk7CisKICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8U2Nyb2xsYmFyPiBjcmVhdGVT Y3JvbGxiYXIoU2Nyb2xsYmFyT3JpZW50YXRpb24pOwogCiAgICAgdmlydHVhbCB2b2lkIHNldENv bnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJik7CkBAIC0yNTgsNiArMjYxLDcgQEAgcHJpdmF0ZToK IAogICAgIGJvb2wgbV9kb0Z1bGxSZXBhaW50OwogICAgIAorICAgIGJvb2wgbV9jYW5IYXZlU2Ny b2xsYmFyczsKICAgICBib29sIG1fdXNlU2xvd1JlcGFpbnRzOwogICAgIGJvb2wgbV9pc092ZXJs YXBwZWQ7CiAgICAgYm9vbCBtX2NvbnRlbnRJc09wYXF1ZTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmll dy5oCShyZXZpc2lvbiA1MDU4NCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCSh3 b3JraW5nIGNvcHkpCkBAIC04OSw3ICs4OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNjcm9sbGJh ck1vZGVzKFNjcm9sbGJhck1vZGUmIGhvcml6b250YWxNb2RlLCBTY3JvbGxiYXJNb2RlJiB2ZXJ0 aWNhbE1vZGUpIGNvbnN0OwogICAgIFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbFNjcm9sbGJhck1v ZGUoKSBjb25zdCB7IFNjcm9sbGJhck1vZGUgaG9yaXpvbnRhbCwgdmVydGljYWw7IHNjcm9sbGJh ck1vZGVzKGhvcml6b250YWwsIHZlcnRpY2FsKTsgcmV0dXJuIGhvcml6b250YWw7IH0KICAgICBT Y3JvbGxiYXJNb2RlIHZlcnRpY2FsU2Nyb2xsYmFyTW9kZSgpIGNvbnN0IHsgU2Nyb2xsYmFyTW9k ZSBob3Jpem9udGFsLCB2ZXJ0aWNhbDsgc2Nyb2xsYmFyTW9kZXMoaG9yaXpvbnRhbCwgdmVydGlj YWwpOyByZXR1cm4gdmVydGljYWw7IH0KLSAgICB2b2lkIHNldENhbkhhdmVTY3JvbGxiYXJzKGJv b2wgZmxhZyk7CisgICAgdmlydHVhbCB2b2lkIHNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wgZmxh Zyk7CiAgICAgYm9vbCBjYW5IYXZlU2Nyb2xsYmFycygpIGNvbnN0IHsgcmV0dXJuIGhvcml6b250 YWxTY3JvbGxiYXJNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmIHx8IHZlcnRpY2FsU2Nyb2xs YmFyTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5c09mZjsgfQogCiAgICAgLy8gT3ZlcnJpZGRlbiBi eSBGcmFtZVZpZXcgdG8gY3JlYXRlIGN1c3RvbSBDU1Mgc2Nyb2xsYmFycyBpZiBhcHBsaWNhYmxl LgpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9D aGFuZ2VMb2cJKHJldmlzaW9uIDUwNTkxKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0xMS0wNSAgTWFyayBNZW50b3ZhaSAgPG1h cmtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFRyYWNrICJjYW4gaGF2ZSBzY3JvbGxiYXIiIHN0YXRlIHdpdGhpbiBGcmFtZVZp ZXcgaW5kZXBlbmRlbnRseSBvZiB0aGUKKyAgICAgICAgaW5kaXZpZHVhbCBzY3JvbGxiYXIgc3Rh dGVzIGluIFNjcm9sbFZpZXcuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTY3CisgICAgICAgIFJFR1JF U1NJT04gKHI0ODA2NCk6IG1pbnQuY29tIGxvc2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91 dCBvZgorICAgICAgICBlZGl0IG1vZGUuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzMxNDQy MSwgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3CisgICAgICAg IFJFR1JFU1NJT04gKHI0ODA2NCk6IEV4dHJhIHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQgTGVz c29uIFN0b3JlLgorCisgICAgICAgIFRlc3Q6IGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3Rv cmVkLmh0bWwKKworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tOgorICAgICAgICAo LVtXZWJGcmFtZVZpZXcgX2luc3RhbGxdKToKKwogMjAwOS0xMS0wMiAgRXJpYyBDYXJsc29uICA8 ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb2huIFN1bGxp dmFuIGFuZCBNYXJrIFJvd2UuCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVWaWV3 Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHJl dmlzaW9uIDUwNTg0KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkod29y a2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBl c0Zyb21DbGFzcyhOU00KICAgICAgICAgb3duZXItPnNldFdpZGdldCh2aWV3KTsKICAgICAgICAg Ly8gTm93IHRoZSByZW5kZXIgcGFydCBvd25zIHRoZSB2aWV3LCBzbyB3ZSBkb24ndCBhbnkgbW9y ZS4KICAgICB9CisKKyAgICB2aWV3LT51cGRhdGVDYW5IYXZlU2Nyb2xsYmFycygpOwogfQogCiBA ZW5kCkluZGV4OiBXZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9D aGFuZ2VMb2cJKHJldmlzaW9uIDUwNTkxKQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDA5LTExLTA1ICBNYXJrIE1lbnRvdmFpICA8bWFy a0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVHJhY2sgImNhbiBoYXZlIHNjcm9sbGJhciIgc3RhdGUgd2l0aGluIEZyYW1lVmll dyBpbmRlcGVuZGVudGx5IG9mIHRoZQorICAgICAgICBpbmRpdmlkdWFsIHNjcm9sbGJhciBzdGF0 ZXMgaW4gU2Nyb2xsVmlldy4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MjE1MTMyLCBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNjcKKyAgICAgICAgUkVHUkVT U0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0 IG9mCisgICAgICAgIGVkaXQgbW9kZS4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MzE0NDIx LCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA1MTcKKyAgICAgICAg UkVHUkVTU0lPTiAocjQ4MDY0KTogRXh0cmEgc2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBMZXNz b24gU3RvcmUuCisKKyAgICAgICAgVGVzdDogZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9y ZWQuaHRtbAorCisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJh bWU6OnNldFNjcm9sbEJhclBvbGljeSk6CisKIDIwMDktMTEtMDUgIFNodSBDaGFuZyAgPENoYW5n LlNodUBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4K SW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQv cXQvQXBpL3F3ZWJmcmFtZS5jcHAJKHJldmlzaW9uIDUwNTg0KQorKysgV2ViS2l0L3F0L0FwaS9x d2ViZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NjcsMTEgKzg2NywxMyBAQCB2b2lkIFFX ZWJGcmFtZTo6c2V0U2Nyb2xsQmFyUG9saWN5KFF0OjpPCiAgICAgICAgIGQtPmhvcml6b250YWxT Y3JvbGxCYXJQb2xpY3kgPSBwb2xpY3k7CiAgICAgICAgIGlmIChkLT5mcmFtZS0+dmlldygpKSB7 CiAgICAgICAgICAgICBkLT5mcmFtZS0+dmlldygpLT5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTW9k ZSgoU2Nyb2xsYmFyTW9kZSlwb2xpY3kpOworICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+ dXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnMoKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAg ICAgIGQtPnZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5ID0gcG9saWN5OwogICAgICAgICBpZiAoZC0+ ZnJhbWUtPnZpZXcoKSkgewogICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+c2V0VmVydGlj YWxTY3JvbGxiYXJNb2RlKChTY3JvbGxiYXJNb2RlKXBvbGljeSk7CisgICAgICAgICAgICBkLT5m cmFtZS0+dmlldygpLT51cGRhdGVDYW5IYXZlU2Nyb2xsYmFycygpOwogICAgICAgICB9CiAgICAg fQogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTA1OTEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMS0wNSAgTWFyayBNZW50b3Zh aSAgPG1hcmtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQp OiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAgICAg ZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9OIChy NDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4KKwor ICAgICAgICAqIGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dDog QWRkZWQuCisgICAgICAgICogZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbDog QWRkZWQuCisKIDIwMDktMTEtMDUgIERhbmllbCBCYXRlcyAgPGRiYXRlc0B3ZWJraXQub3JnPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4 dAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJl c3RvcmVkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw1IEBACitUZXN0IGZv ciByZGFyOi8vcHJvYmxlbS83MjE1MTMyLCBidWcgMjkxNjcsIFJFR1JFU1NJT04gKHI0ODA2NCk6 IG1pbnQuY29tIGxvc2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91dCBvZiBlZGl0IG1vZGUs IGFuZCByZGFyOi8vcHJvYmxlbS83MzE0NDIxLCBidWcgMzA1MTcsIFJFR1JFU1NJT04gKHI0ODA2 NCk6IEV4dHJhIHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQgTGVzc29uIFN0b3JlLgorCitUaGlz IHRlc3RzIHRoYXQgYWZ0ZXIgc2V0dGluZyAnb3ZlcmZsb3cnIG9uIHRoZSBkb2N1bWVudCBlbGVt ZW50IHRvICdoaWRkZW4nIGFuZCBiYWNrIHRvICd2aXNpYmxlJywgc2Nyb2xsYmFycyBhcHBlYXIg YXMgbmVjZXNzYXJ5LgorCitQQVNTCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBMYXlvdXRUZXN0cy9m YXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpB ZGRlZDogc3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoKSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv b3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVz dHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbAkocmV2aXNpb24gMCkKKysr IExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwJKHJldmlz aW9uIDApCkBAIC0wLDAgKzEsMjkgQEAKKzxib2R5PgorICAgIDxwPgorICAgICAgICBUZXN0IGZv ciA8aT48YSBocmVmPSJyZGFyOi8vcHJvYmxlbS83MjE1MTMyIj5yZGFyOi8vcHJvYmxlbS83MjE1 MTMyPC9hPiwKKyAgICAgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI5MTY3Ij5idWcgMjkxNjc8L2E+LAorICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YgZWRpdCBt b2RlPC9pPiwKKyAgICAgICAgYW5kIDxpPjxhIGhyZWY9InJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEi PnJkYXI6Ly9wcm9ibGVtLzczMTQ0MjE8L2E+LAorICAgICAgICA8YSBocmVmPSJodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA1MTciPmJ1ZyAzMDUxNzwvYT4sCisgICAg ICAgIFJFR1JFU1NJT04gKHI0ODA2NCk6IEV4dHJhIHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQg TGVzc29uIFN0b3JlPC9pPi4KKyAgICA8L3A+CisgICAgPHA+CisgICAgICAgIFRoaXMgdGVzdHMg dGhhdCBhZnRlciBzZXR0aW5nICdvdmVyZmxvdycgb24gdGhlIGRvY3VtZW50IGVsZW1lbnQgdG8K KyAgICAgICAgJ2hpZGRlbicgYW5kIGJhY2sgdG8gJ3Zpc2libGUnLCBzY3JvbGxiYXJzIGFwcGVh ciBhcyBuZWNlc3NhcnkuCisgICAgPC9wPgorICAgIDxwIGlkPSJyZXN1bHQiPkZBSUw6IFRlc3Qg ZGlkIG5vdCBydW4gdG8gY29tcGxldGlvbjwvcD4KKyAgICA8c2NyaXB0PgorICAgICAgICBpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuZHVtcEFzVGV4dCgpOworCisgICAgICAgIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5z dHlsZS5vdmVyZmxvdyA9ICJoaWRkZW4iOworICAgICAgICBkb2N1bWVudC5ib2R5Lm9mZnNldFRv cDsKKyAgICAgICAgZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50LnN0eWxlLnJlbW92ZVByb3BlcnR5 KCJvdmVyZmxvdyIpOworICAgICAgICBkb2N1bWVudC5ib2R5LnN0eWxlLmhlaWdodCA9ICIyMDAl IjsKKyAgICAgICAgdmFyIHJlc3VsdCA9IChpbm5lcldpZHRoID09PSBkb2N1bWVudC5kb2N1bWVu dEVsZW1lbnQub2Zmc2V0V2lkdGgpCisgICAgICAgICAgICA/ICJGQUlMOiBTY3JvbGxiYXIgZGlk IG5vdCBhcHBlYXIgYWZ0ZXIgcmVzZXR0aW5nICdvdmVyZmxvdyciCisgICAgICAgICAgICA6ICJQ QVNTIgorCisgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJyZXN1bHQiKS5pbm5lclRl eHQgPSByZXN1bHQ7CisgICAgPC9zY3JpcHQ+Cis8L2JvZHk+CgpQcm9wZXJ0eSBjaGFuZ2VzIG9u OiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L2h0bWwKQWRkZWQ6IHN2bjplb2wt c3R5bGUKICAgKyBuYXRpdmUKCg== 42665 2009-11-06 11:56:41 -0800 2009-11-06 12:12:19 -0800 Removed parameter name from declaration webkit.29167.5.patch text/plain 12443 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDYwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTEtMDYgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBXZWJDb3JlLmJhc2UuZXhwOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6RnJhbWVWaWV3KToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6cmVzZXRTY3JvbGxiYXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3Ojp1cGRhdGVDYW5IYXZlU2Nyb2xsYmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OmxheW91dCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxWaWV3Lmg6CisKIDIwMDktMTEtMDYgIERyZXcgV2lsc29uICA8YXR3aWxzb25A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDog V2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5i YXNlLmV4cAkocmV2aXNpb24gNTA2MDEpCisrKyBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHdv cmtpbmcgY29weSkKQEAgLTY4OCw2ICs2ODgsNyBAQCBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjFm bHVzaERlZmVycmVkUmVwCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjFzY3JvbGxQb3NpdGlvbkNo YW5nZWRFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzIyc2V0QmFzZUJhY2tncm91bmRDb2xvckVO U181Q29sb3JFCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjNsYXlvdXRJZk5lZWRlZFJlY3Vyc2l2 ZUV2CitfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjN1cGRhdGVDYW5IYXZlU2Nyb2xsYmFyc0V2CiBf X1pON1dlYkNvcmU5RnJhbWVWaWV3Mjlmb3JjZUxheW91dFdpdGhQYWdlV2lkdGhSYW5nZUVmZmIK IF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyOXNldFNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuRWIK IF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyOXN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlRXYK SW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiA1MDYwMSkKKysrIFdlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDcgQEAgc3RydWN0IFNjaGVk dWxlZEV2ZW50IHsKIAogRnJhbWVWaWV3OjpGcmFtZVZpZXcoRnJhbWUqIGZyYW1lKQogICAgIDog bV9mcmFtZShmcmFtZSkKKyAgICAsIG1fY2FuSGF2ZVNjcm9sbGJhcnModHJ1ZSkKICAgICAsIG1f c2xvd1JlcGFpbnRPYmplY3RDb3VudCgwKQogICAgICwgbV9sYXlvdXRUaW1lcih0aGlzLCAmRnJh bWVWaWV3OjpsYXlvdXRUaW1lckZpcmVkKQogICAgICwgbV9sYXlvdXRSb290KDApCkBAIC0yMTks NyArMjIwLDEwIEBAIHZvaWQgRnJhbWVWaWV3OjpyZXNldFNjcm9sbGJhcnMoKQogICAgIC8vIFJl c2V0IHRoZSBkb2N1bWVudCdzIHNjcm9sbGJhcnMgYmFjayB0byBvdXIgZGVmYXVsdHMgYmVmb3Jl IHdlIHlpZWxkIHRoZSBmbG9vci4KICAgICBtX2ZpcnN0TGF5b3V0ID0gdHJ1ZTsKICAgICBzZXRT Y3JvbGxiYXJzU3VwcHJlc3NlZCh0cnVlKTsKLSAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxi YXJBdXRvLCBTY3JvbGxiYXJBdXRvKTsKKyAgICBpZiAobV9jYW5IYXZlU2Nyb2xsYmFycykKKyAg ICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyQXV0bywgU2Nyb2xsYmFyQXV0byk7Cisg ICAgZWxzZQorICAgICAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJBbHdheXNPZmYsIFNj cm9sbGJhckFsd2F5c09mZik7CiAgICAgc2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQoZmFsc2UpOwog fQogCkBAIC0zMTYsNiArMzIwLDIzIEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRNYXJnaW5IZWlnaHQo aW50IGgpCiAgICAgbV9tYXJnaW5zLnNldEhlaWdodChoKTsKIH0KIAordm9pZCBGcmFtZVZpZXc6 OnNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wgY2FuSGF2ZVNjcm9sbGJhcnMpCit7CisgICAgbV9j YW5IYXZlU2Nyb2xsYmFycyA9IGNhbkhhdmVTY3JvbGxiYXJzOworICAgIFNjcm9sbFZpZXc6OnNl dENhbkhhdmVTY3JvbGxiYXJzKGNhbkhhdmVTY3JvbGxiYXJzKTsKK30KKwordm9pZCBGcmFtZVZp ZXc6OnVwZGF0ZUNhbkhhdmVTY3JvbGxiYXJzKCkKK3sKKyAgICBTY3JvbGxiYXJNb2RlIGhNb2Rl OworICAgIFNjcm9sbGJhck1vZGUgdk1vZGU7CisgICAgc2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZN b2RlKTsKKyAgICBpZiAoaE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmICYmIHZNb2RlID09IFNj cm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgbV9jYW5IYXZlU2Nyb2xsYmFycyA9IGZhbHNlOwor ICAgIGVsc2UKKyAgICAgICAgbV9jYW5IYXZlU2Nyb2xsYmFycyA9IHRydWU7Cit9CisKIFBhc3NS ZWZQdHI8U2Nyb2xsYmFyPiBGcmFtZVZpZXc6OmNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmll bnRhdGlvbiBvcmllbnRhdGlvbikKIHsKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byB1cGRhdGUg dGhlIHNjcm9sbGJhciBkeW5hbWljYWxseSBhcyBkb2N1bWVudHMgY2hhbmdlIChvciBhcyBkb2Mg ZWxlbWVudHMgYW5kIGJvZGllcyBnZXQgZGlzY292ZXJlZCB0aGF0IGhhdmUgY3VzdG9tIHN0eWxl cykuCkBAIC01NjIsNyArNTgzLDE2IEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxv d1N1YnRyZWUKIAogICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7CiAgICAgU2Nyb2xsYmFyTW9kZSB2 TW9kZTsKLSAgICBzY3JvbGxiYXJNb2RlcyhoTW9kZSwgdk1vZGUpOworICAgIGlmICghbV9jYW5I YXZlU2Nyb2xsYmFycykgeworICAgICAgICBoTW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKKyAg ICAgICAgdk1vZGUgPSBTY3JvbGxiYXJBbHdheXNPZmY7CisgICAgfSBlbHNlIHsKKyAgICAgICAg c2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZNb2RlKTsKKyAgICAgICAgaWYgKGhNb2RlID09IFNjcm9s bGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAgICAg ICAgaWYgKHZNb2RlID09IFNjcm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgICAgIHZNb2RlID0g U2Nyb2xsYmFyQXV0bzsKKyAgICB9CiAKICAgICBpZiAoIXN1YnRyZWUpIHsKICAgICAgICAgUmVu ZGVyT2JqZWN0KiByb290UmVuZGVyZXIgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCkgPyBk b2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCktPnJlbmRlcmVyKCkgOiAwOwpJbmRleDogV2ViQ29y ZS9wYWdlL0ZyYW1lVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcu aAkocmV2aXNpb24gNTA2MDEpCisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcg Y29weSkKQEAgLTcyLDYgKzcyLDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TWFyZ2luV2lkdGgo aW50KTsKICAgICB2b2lkIHNldE1hcmdpbkhlaWdodChpbnQpOwogCisgICAgdmlydHVhbCB2b2lk IHNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wpOworICAgIHZvaWQgdXBkYXRlQ2FuSGF2ZVNjcm9s bGJhcnMoKTsKKwogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxTY3JvbGxiYXI+IGNyZWF0ZVNjcm9s bGJhcihTY3JvbGxiYXJPcmllbnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVu dHNTaXplKGNvbnN0IEludFNpemUmKTsKQEAgLTI1OCw2ICsyNjEsNyBAQCBwcml2YXRlOgogCiAg ICAgYm9vbCBtX2RvRnVsbFJlcGFpbnQ7CiAgICAgCisgICAgYm9vbCBtX2NhbkhhdmVTY3JvbGxi YXJzOwogICAgIGJvb2wgbV91c2VTbG93UmVwYWludHM7CiAgICAgYm9vbCBtX2lzT3ZlcmxhcHBl ZDsKICAgICBib29sIG1fY29udGVudElzT3BhcXVlOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9T Y3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJ KHJldmlzaW9uIDUwNjAxKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdvcmtp bmcgY29weSkKQEAgLTg5LDcgKzg5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2Nyb2xsYmFyTW9k ZXMoU2Nyb2xsYmFyTW9kZSYgaG9yaXpvbnRhbE1vZGUsIFNjcm9sbGJhck1vZGUmIHZlcnRpY2Fs TW9kZSkgY29uc3Q7CiAgICAgU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgp IGNvbnN0IHsgU2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsLCB2ZXJ0aWNhbDsgc2Nyb2xsYmFyTW9k ZXMoaG9yaXpvbnRhbCwgdmVydGljYWwpOyByZXR1cm4gaG9yaXpvbnRhbDsgfQogICAgIFNjcm9s bGJhck1vZGUgdmVydGljYWxTY3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJNb2RlIGhv cml6b250YWwsIHZlcnRpY2FsOyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0aWNhbCk7 IHJldHVybiB2ZXJ0aWNhbDsgfQotICAgIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBm bGFnKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCk7CiAgICAg Ym9vbCBjYW5IYXZlU2Nyb2xsYmFycygpIGNvbnN0IHsgcmV0dXJuIGhvcml6b250YWxTY3JvbGxi YXJNb2RlKCkgIT0gU2Nyb2xsYmFyQWx3YXlzT2ZmIHx8IHZlcnRpY2FsU2Nyb2xsYmFyTW9kZSgp ICE9IFNjcm9sbGJhckFsd2F5c09mZjsgfQogCiAgICAgLy8gT3ZlcnJpZGRlbiBieSBGcmFtZVZp ZXcgdG8gY3JlYXRlIGN1c3RvbSBDU1Mgc2Nyb2xsYmFycyBpZiBhcHBsaWNhYmxlLgpJbmRleDog V2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDUwNjAxKQorKysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwyMiBAQAorMjAwOS0xMS0wNiAgTWFyayBNZW50b3ZhaSAgPG1hcmtAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRyYWNrICJjYW4gaGF2ZSBzY3JvbGxiYXIiIHN0YXRlIHdpdGhpbiBGcmFtZVZpZXcgaW5kZXBl bmRlbnRseSBvZiB0aGUKKyAgICAgICAgaW5kaXZpZHVhbCBzY3JvbGxiYXIgc3RhdGVzIGluIFNj cm9sbFZpZXcuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI5MTY3CisgICAgICAgIFJFR1JFU1NJT04gKHI0 ODA2NCk6IG1pbnQuY29tIGxvc2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91dCBvZgorICAg ICAgICBlZGl0IG1vZGUuCisKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3CisgICAgICAgIFJFR1JFU1NJ T04gKHI0ODA2NCk6IEV4dHJhIHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQgTGVzc29uIFN0b3Jl LgorCisgICAgICAgIFRlc3Q6IGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwK KworICAgICAgICAqIFdlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tOgorICAgICAgICAoLVtXZWJGcmFt ZVZpZXcgX2luc3RhbGxdKToKKwogMjAwOS0xMS0wMiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb2huIFN1bGxpdmFuIGFuZCBN YXJrIFJvd2UuCkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHJldmlzaW9uIDUw NjAxKQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkod29ya2luZyBjb3B5 KQpAQCAtMjczLDYgKzI3Myw4IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBlc0Zyb21DbGFz cyhOU00KICAgICAgICAgb3duZXItPnNldFdpZGdldCh2aWV3KTsKICAgICAgICAgLy8gTm93IHRo ZSByZW5kZXIgcGFydCBvd25zIHRoZSB2aWV3LCBzbyB3ZSBkb24ndCBhbnkgbW9yZS4KICAgICB9 CisKKyAgICB2aWV3LT51cGRhdGVDYW5IYXZlU2Nyb2xsYmFycygpOwogfQogCiBAZW5kCkluZGV4 OiBXZWJLaXQvcXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJ KHJldmlzaW9uIDUwNjAxKQorKysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDIyIEBACisyMDA5LTExLTA2ICBNYXJrIE1lbnRvdmFpICA8bWFya0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VHJhY2sgImNhbiBoYXZlIHNjcm9sbGJhciIgc3RhdGUgd2l0aGluIEZyYW1lVmlldyBpbmRlcGVu ZGVudGx5IG9mIHRoZQorICAgICAgICBpbmRpdmlkdWFsIHNjcm9sbGJhciBzdGF0ZXMgaW4gU2Ny b2xsVmlldy4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MjE1MTMyLCBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjkxNjcKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4 MDY0KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9mCisgICAg ICAgIGVkaXQgbW9kZS4KKworICAgICAgICByZGFyOi8vcHJvYmxlbS83MzE0NDIxLCBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzA1MTcKKyAgICAgICAgUkVHUkVTU0lP TiAocjQ4MDY0KTogRXh0cmEgc2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBMZXNzb24gU3RvcmUu CisKKyAgICAgICAgVGVzdDogZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbAor CisgICAgICAgICogQXBpL3F3ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OnNldFNj cm9sbEJhclBvbGljeSk6CisKIDIwMDktMTEtMDUgIFNodSBDaGFuZyAgPENoYW5nLlNodUBub2tp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdl YktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3 ZWJmcmFtZS5jcHAJKHJldmlzaW9uIDUwNjAxKQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NjcsMTEgKzg2NywxMyBAQCB2b2lkIFFXZWJGcmFtZTo6 c2V0U2Nyb2xsQmFyUG9saWN5KFF0OjpPCiAgICAgICAgIGQtPmhvcml6b250YWxTY3JvbGxCYXJQ b2xpY3kgPSBwb2xpY3k7CiAgICAgICAgIGlmIChkLT5mcmFtZS0+dmlldygpKSB7CiAgICAgICAg ICAgICBkLT5mcmFtZS0+dmlldygpLT5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgoU2Nyb2xs YmFyTW9kZSlwb2xpY3kpOworICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+dXBkYXRlQ2Fu SGF2ZVNjcm9sbGJhcnMoKTsKICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGQtPnZl cnRpY2FsU2Nyb2xsQmFyUG9saWN5ID0gcG9saWN5OwogICAgICAgICBpZiAoZC0+ZnJhbWUtPnZp ZXcoKSkgewogICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+c2V0VmVydGljYWxTY3JvbGxi YXJNb2RlKChTY3JvbGxiYXJNb2RlKXBvbGljeSk7CisgICAgICAgICAgICBkLT5mcmFtZS0+dmll dygpLT51cGRhdGVDYW5IYXZlU2Nyb2xsYmFycygpOwogICAgICAgICB9CiAgICAgfQogfQpJbmRl eDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5n ZUxvZwkocmV2aXNpb24gNTA2MDEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcg Y29weSkKQEAgLTEsMyArMSwxNyBAQAorMjAwOS0xMS0wNiAgTWFyayBNZW50b3ZhaSAgPG1hcmtA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBtaW50LmNv bSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAgICAgZWRpdCBtb2Rl LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBF eHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4KKworICAgICAgICAq IGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbDogQWRkZWQuCisK IDIwMDktMTEtMDQgIFNoaW5pY2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qv b3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0 b3JlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNSBAQAorVGVzdCBmb3Ig cmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgYnVnIDI5MTY3LCBSRUdSRVNTSU9OIChyNDgwNjQpOiBt aW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YgZWRpdCBtb2RlLCBh bmQgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgYnVnIDMwNTE3LCBSRUdSRVNTSU9OIChyNDgwNjQp OiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4KKworVGhpcyB0 ZXN0cyB0aGF0IGFmdGVyIHNldHRpbmcgJ292ZXJmbG93JyBvbiB0aGUgZG9jdW1lbnQgZWxlbWVu dCB0byAnaGlkZGVuJyBhbmQgYmFjayB0byAndmlzaWJsZScsIHNjcm9sbGJhcnMgYXBwZWFyIGFz IG5lY2Vzc2FyeS4KKworUEFTUwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFz dC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRk ZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCShyZXZpc2lv biAwKQpAQCAtMCwwICsxLDI5IEBACis8Ym9keT4KKyAgICA8cD4KKyAgICAgICAgVGVzdCBmb3Ig PGk+PGEgaHJlZj0icmRhcjovL3Byb2JsZW0vNzIxNTEzMiI+cmRhcjovL3Byb2JsZW0vNzIxNTEz MjwvYT4sCisgICAgICAgIDxhIGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yOTE2NyI+YnVnIDI5MTY3PC9hPiwKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0 KTogbWludC5jb20gbG9zZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9mIGVkaXQgbW9k ZTwvaT4sCisgICAgICAgIGFuZCA8aT48YSBocmVmPSJyZGFyOi8vcHJvYmxlbS83MzE0NDIxIj5y ZGFyOi8vcHJvYmxlbS83MzE0NDIxPC9hPiwKKyAgICAgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMwNTE3Ij5idWcgMzA1MTc8L2E+LAorICAgICAg ICBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExl c3NvbiBTdG9yZTwvaT4uCisgICAgPC9wPgorICAgIDxwPgorICAgICAgICBUaGlzIHRlc3RzIHRo YXQgYWZ0ZXIgc2V0dGluZyAnb3ZlcmZsb3cnIG9uIHRoZSBkb2N1bWVudCBlbGVtZW50IHRvCisg ICAgICAgICdoaWRkZW4nIGFuZCBiYWNrIHRvICd2aXNpYmxlJywgc2Nyb2xsYmFycyBhcHBlYXIg YXMgbmVjZXNzYXJ5LgorICAgIDwvcD4KKyAgICA8cCBpZD0icmVzdWx0Ij5GQUlMOiBUZXN0IGRp ZCBub3QgcnVuIHRvIGNvbXBsZXRpb248L3A+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdp bmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9s bGVyLmR1bXBBc1RleHQoKTsKKworICAgICAgICBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuc3R5 bGUub3ZlcmZsb3cgPSAiaGlkZGVuIjsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7 CisgICAgICAgIGRvY3VtZW50LmRvY3VtZW50RWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgi b3ZlcmZsb3ciKTsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5zdHlsZS5oZWlnaHQgPSAiMjAwJSI7 CisgICAgICAgIHZhciByZXN1bHQgPSAoaW5uZXJXaWR0aCA9PT0gZG9jdW1lbnQuZG9jdW1lbnRF bGVtZW50Lm9mZnNldFdpZHRoKQorICAgICAgICAgICAgPyAiRkFJTDogU2Nyb2xsYmFyIGRpZCBu b3QgYXBwZWFyIGFmdGVyIHJlc2V0dGluZyAnb3ZlcmZsb3cnIgorICAgICAgICAgICAgOiAiUEFT UyIKKworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJUZXh0 ID0gcmVzdWx0OworICAgIDwvc2NyaXB0PgorPC9ib2R5PgoKUHJvcGVydHkgY2hhbmdlcyBvbjog TGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbApfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fCkFkZGVkOiBzdm46bWltZS10eXBlCiAgICsgdGV4dC9odG1sCkFkZGVkOiBzdm46ZW9sLXN0 eWxlCiAgICsgbmF0aXZlCgo= 42666 2009-11-06 12:12:19 -0800 2009-11-09 09:54:39 -0800 Make FrameView::layout() start at ScrollbarAuto or ScrollbarAlwaysOff without checking the existing ScrollView state webkit.29167.6.patch text/plain 12311 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MDYwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjkgQEAKKzIwMDktMTEtMDYgIE1hcmsgTWVudG92YWkgIDxtYXJrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU cmFjayAiY2FuIGhhdmUgc2Nyb2xsYmFyIiBzdGF0ZSB3aXRoaW4gRnJhbWVWaWV3IGluZGVwZW5k ZW50bHkgb2YgdGhlCisgICAgICAgIGluZGl2aWR1YWwgc2Nyb2xsYmFyIHN0YXRlcyBpbiBTY3Jv bGxWaWV3LgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NworICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAg ICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9O IChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4K KworICAgICAgICBUZXN0OiBmYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCisK KyAgICAgICAgKiBXZWJDb3JlLmJhc2UuZXhwOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6RnJhbWVWaWV3KToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lVmlldzo6cmVzZXRTY3JvbGxiYXJzKToKKyAgICAgICAgKFdlYkNvcmU6OkZy YW1lVmlldzo6c2V0Q2FuSGF2ZVNjcm9sbGJhcnMpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3Ojp1cGRhdGVDYW5IYXZlU2Nyb2xsYmFycyk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVZp ZXc6OmxheW91dCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuaDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9TY3JvbGxWaWV3Lmg6CisKIDIwMDktMTEtMDYgIERyZXcgV2lsc29uICA8YXR3aWxzb25A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgpJbmRleDog V2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5i YXNlLmV4cAkocmV2aXNpb24gNTA2MDEpCisrKyBXZWJDb3JlL1dlYkNvcmUuYmFzZS5leHAJKHdv cmtpbmcgY29weSkKQEAgLTY4OCw2ICs2ODgsNyBAQCBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjFm bHVzaERlZmVycmVkUmVwCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjFzY3JvbGxQb3NpdGlvbkNo YW5nZWRFdgogX19aTjdXZWJDb3JlOUZyYW1lVmlldzIyc2V0QmFzZUJhY2tncm91bmRDb2xvckVO U181Q29sb3JFCiBfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjNsYXlvdXRJZk5lZWRlZFJlY3Vyc2l2 ZUV2CitfX1pON1dlYkNvcmU5RnJhbWVWaWV3MjN1cGRhdGVDYW5IYXZlU2Nyb2xsYmFyc0V2CiBf X1pON1dlYkNvcmU5RnJhbWVWaWV3Mjlmb3JjZUxheW91dFdpdGhQYWdlV2lkdGhSYW5nZUVmZmIK IF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyOXNldFNob3VsZFVwZGF0ZVdoaWxlT2Zmc2NyZWVuRWIK IF9fWk43V2ViQ29yZTlGcmFtZVZpZXcyOXN5bmNDb21wb3NpdGluZ1N0YXRlUmVjdXJzaXZlRXYK SW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiA1MDYwMSkKKysrIFdlYkNvcmUvcGFnZS9GcmFt ZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDcgQEAgc3RydWN0IFNjaGVk dWxlZEV2ZW50IHsKIAogRnJhbWVWaWV3OjpGcmFtZVZpZXcoRnJhbWUqIGZyYW1lKQogICAgIDog bV9mcmFtZShmcmFtZSkKKyAgICAsIG1fY2FuSGF2ZVNjcm9sbGJhcnModHJ1ZSkKICAgICAsIG1f c2xvd1JlcGFpbnRPYmplY3RDb3VudCgwKQogICAgICwgbV9sYXlvdXRUaW1lcih0aGlzLCAmRnJh bWVWaWV3OjpsYXlvdXRUaW1lckZpcmVkKQogICAgICwgbV9sYXlvdXRSb290KDApCkBAIC0yMTks NyArMjIwLDEwIEBAIHZvaWQgRnJhbWVWaWV3OjpyZXNldFNjcm9sbGJhcnMoKQogICAgIC8vIFJl c2V0IHRoZSBkb2N1bWVudCdzIHNjcm9sbGJhcnMgYmFjayB0byBvdXIgZGVmYXVsdHMgYmVmb3Jl IHdlIHlpZWxkIHRoZSBmbG9vci4KICAgICBtX2ZpcnN0TGF5b3V0ID0gdHJ1ZTsKICAgICBzZXRT Y3JvbGxiYXJzU3VwcHJlc3NlZCh0cnVlKTsKLSAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxi YXJBdXRvLCBTY3JvbGxiYXJBdXRvKTsKKyAgICBpZiAobV9jYW5IYXZlU2Nyb2xsYmFycykKKyAg ICAgICAgc2V0U2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyQXV0bywgU2Nyb2xsYmFyQXV0byk7Cisg ICAgZWxzZQorICAgICAgICBzZXRTY3JvbGxiYXJNb2RlcyhTY3JvbGxiYXJBbHdheXNPZmYsIFNj cm9sbGJhckFsd2F5c09mZik7CiAgICAgc2V0U2Nyb2xsYmFyc1N1cHByZXNzZWQoZmFsc2UpOwog fQogCkBAIC0zMTYsNiArMzIwLDIzIEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRNYXJnaW5IZWlnaHQo aW50IGgpCiAgICAgbV9tYXJnaW5zLnNldEhlaWdodChoKTsKIH0KIAordm9pZCBGcmFtZVZpZXc6 OnNldENhbkhhdmVTY3JvbGxiYXJzKGJvb2wgY2FuSGF2ZVNjcm9sbGJhcnMpCit7CisgICAgbV9j YW5IYXZlU2Nyb2xsYmFycyA9IGNhbkhhdmVTY3JvbGxiYXJzOworICAgIFNjcm9sbFZpZXc6OnNl dENhbkhhdmVTY3JvbGxiYXJzKGNhbkhhdmVTY3JvbGxiYXJzKTsKK30KKwordm9pZCBGcmFtZVZp ZXc6OnVwZGF0ZUNhbkhhdmVTY3JvbGxiYXJzKCkKK3sKKyAgICBTY3JvbGxiYXJNb2RlIGhNb2Rl OworICAgIFNjcm9sbGJhck1vZGUgdk1vZGU7CisgICAgc2Nyb2xsYmFyTW9kZXMoaE1vZGUsIHZN b2RlKTsKKyAgICBpZiAoaE1vZGUgPT0gU2Nyb2xsYmFyQWx3YXlzT2ZmICYmIHZNb2RlID09IFNj cm9sbGJhckFsd2F5c09mZikKKyAgICAgICAgbV9jYW5IYXZlU2Nyb2xsYmFycyA9IGZhbHNlOwor ICAgIGVsc2UKKyAgICAgICAgbV9jYW5IYXZlU2Nyb2xsYmFycyA9IHRydWU7Cit9CisKIFBhc3NS ZWZQdHI8U2Nyb2xsYmFyPiBGcmFtZVZpZXc6OmNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmll bnRhdGlvbiBvcmllbnRhdGlvbikKIHsKICAgICAvLyBGSVhNRTogV2UgbmVlZCB0byB1cGRhdGUg dGhlIHNjcm9sbGJhciBkeW5hbWljYWxseSBhcyBkb2N1bWVudHMgY2hhbmdlIChvciBhcyBkb2Mg ZWxlbWVudHMgYW5kIGJvZGllcyBnZXQgZGlzY292ZXJlZCB0aGF0IGhhdmUgY3VzdG9tIHN0eWxl cykuCkBAIC01NjIsNyArNTgzLDEzIEBAIHZvaWQgRnJhbWVWaWV3OjpsYXlvdXQoYm9vbCBhbGxv d1N1YnRyZWUKIAogICAgIFNjcm9sbGJhck1vZGUgaE1vZGU7CiAgICAgU2Nyb2xsYmFyTW9kZSB2 TW9kZTsKLSAgICBzY3JvbGxiYXJNb2RlcyhoTW9kZSwgdk1vZGUpOworICAgIGlmIChtX2Nhbkhh dmVTY3JvbGxiYXJzKSB7CisgICAgICAgIGhNb2RlID0gU2Nyb2xsYmFyQXV0bzsKKyAgICAgICAg dk1vZGUgPSBTY3JvbGxiYXJBdXRvOworICAgIH0gZWxzZSB7CisgICAgICAgIGhNb2RlID0gU2Ny b2xsYmFyQWx3YXlzT2ZmOworICAgICAgICB2TW9kZSA9IFNjcm9sbGJhckFsd2F5c09mZjsKKyAg ICB9CiAKICAgICBpZiAoIXN1YnRyZWUpIHsKICAgICAgICAgUmVuZGVyT2JqZWN0KiByb290UmVu ZGVyZXIgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50KCkgPyBkb2N1bWVudC0+ZG9jdW1lbnRF bGVtZW50KCktPnJlbmRlcmVyKCkgOiAwOwpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaAkocmV2aXNpb24gNTA2MDEp CisrKyBXZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTcyLDYgKzcy LDkgQEAgcHVibGljOgogICAgIHZvaWQgc2V0TWFyZ2luV2lkdGgoaW50KTsKICAgICB2b2lkIHNl dE1hcmdpbkhlaWdodChpbnQpOwogCisgICAgdmlydHVhbCB2b2lkIHNldENhbkhhdmVTY3JvbGxi YXJzKGJvb2wpOworICAgIHZvaWQgdXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnMoKTsKKwogICAgIHZp cnR1YWwgUGFzc1JlZlB0cjxTY3JvbGxiYXI+IGNyZWF0ZVNjcm9sbGJhcihTY3JvbGxiYXJPcmll bnRhdGlvbik7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNTaXplKGNvbnN0IEludFNp emUmKTsKQEAgLTI1OCw2ICsyNjEsNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2RvRnVsbFJl cGFpbnQ7CiAgICAgCisgICAgYm9vbCBtX2NhbkhhdmVTY3JvbGxiYXJzOwogICAgIGJvb2wgbV91 c2VTbG93UmVwYWludHM7CiAgICAgYm9vbCBtX2lzT3ZlcmxhcHBlZDsKICAgICBib29sIG1fY29u dGVudElzT3BhcXVlOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHJldmlzaW9uIDUwNjAxKQor KysgV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgJKHdvcmtpbmcgY29weSkKQEAgLTg5LDcg Kzg5LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2Nyb2xsYmFyTW9kZXMoU2Nyb2xsYmFyTW9kZSYg aG9yaXpvbnRhbE1vZGUsIFNjcm9sbGJhck1vZGUmIHZlcnRpY2FsTW9kZSkgY29uc3Q7CiAgICAg U2Nyb2xsYmFyTW9kZSBob3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgpIGNvbnN0IHsgU2Nyb2xsYmFy TW9kZSBob3Jpem9udGFsLCB2ZXJ0aWNhbDsgc2Nyb2xsYmFyTW9kZXMoaG9yaXpvbnRhbCwgdmVy dGljYWwpOyByZXR1cm4gaG9yaXpvbnRhbDsgfQogICAgIFNjcm9sbGJhck1vZGUgdmVydGljYWxT Y3JvbGxiYXJNb2RlKCkgY29uc3QgeyBTY3JvbGxiYXJNb2RlIGhvcml6b250YWwsIHZlcnRpY2Fs OyBzY3JvbGxiYXJNb2Rlcyhob3Jpem9udGFsLCB2ZXJ0aWNhbCk7IHJldHVybiB2ZXJ0aWNhbDsg fQotICAgIHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCBmbGFnKTsKKyAgICB2aXJ0dWFs IHZvaWQgc2V0Q2FuSGF2ZVNjcm9sbGJhcnMoYm9vbCk7CiAgICAgYm9vbCBjYW5IYXZlU2Nyb2xs YmFycygpIGNvbnN0IHsgcmV0dXJuIGhvcml6b250YWxTY3JvbGxiYXJNb2RlKCkgIT0gU2Nyb2xs YmFyQWx3YXlzT2ZmIHx8IHZlcnRpY2FsU2Nyb2xsYmFyTW9kZSgpICE9IFNjcm9sbGJhckFsd2F5 c09mZjsgfQogCiAgICAgLy8gT3ZlcnJpZGRlbiBieSBGcmFtZVZpZXcgdG8gY3JlYXRlIGN1c3Rv bSBDU1Mgc2Nyb2xsYmFycyBpZiBhcHBsaWNhYmxlLgpJbmRleDogV2ViS2l0L21hYy9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNjAxKQor KysgV2ViS2l0L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAor MjAwOS0xMS0wNiAgTWFyayBNZW50b3ZhaSAgPG1hcmtAY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRyYWNrICJjYW4gaGF2ZSBz Y3JvbGxiYXIiIHN0YXRlIHdpdGhpbiBGcmFtZVZpZXcgaW5kZXBlbmRlbnRseSBvZiB0aGUKKyAg ICAgICAgaW5kaXZpZHVhbCBzY3JvbGxiYXIgc3RhdGVzIGluIFNjcm9sbFZpZXcuCisKKyAgICAg ICAgcmRhcjovL3Byb2JsZW0vNzIxNTEzMiwgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI5MTY3CisgICAgICAgIFJFR1JFU1NJT04gKHI0ODA2NCk6IG1pbnQuY29tIGxv c2VzIHNjcm9sbGJhcnMgYWZ0ZXIgY29taW5nIG91dCBvZgorICAgICAgICBlZGl0IG1vZGUuCisK KyAgICAgICAgcmRhcjovL3Byb2JsZW0vNzMxNDQyMSwgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTMwNTE3CisgICAgICAgIFJFR1JFU1NJT04gKHI0ODA2NCk6IEV4dHJh IHNjcm9sbCBiYXJzIGluIEdhcmFnZUJhbmQgTGVzc29uIFN0b3JlLgorCisgICAgICAgIFRlc3Q6 IGZhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFyLXJlc3RvcmVkLmh0bWwKKworICAgICAgICAqIFdlYlZp ZXcvV2ViRnJhbWVWaWV3Lm1tOgorICAgICAgICAoLVtXZWJGcmFtZVZpZXcgX2luc3RhbGxdKToK KwogMjAwOS0xMS0wMiAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBKb2huIFN1bGxpdmFuIGFuZCBNYXJrIFJvd2UuCkluZGV4OiBX ZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9t YWMvV2ViVmlldy9XZWJGcmFtZVZpZXcubW0JKHJldmlzaW9uIDUwNjAxKQorKysgV2ViS2l0L21h Yy9XZWJWaWV3L1dlYkZyYW1lVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjczLDYgKzI3Myw4 IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBhZGRUeXBlc0Zyb21DbGFzcyhOU00KICAgICAgICAgb3du ZXItPnNldFdpZGdldCh2aWV3KTsKICAgICAgICAgLy8gTm93IHRoZSByZW5kZXIgcGFydCBvd25z IHRoZSB2aWV3LCBzbyB3ZSBkb24ndCBhbnkgbW9yZS4KICAgICB9CisKKyAgICB2aWV3LT51cGRh dGVDYW5IYXZlU2Nyb2xsYmFycygpOwogfQogCiBAZW5kCkluZGV4OiBXZWJLaXQvcXQvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDUwNjAxKQor KysgV2ViS2l0L3F0L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisy MDA5LTExLTA2ICBNYXJrIE1lbnRvdmFpICA8bWFya0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVHJhY2sgImNhbiBoYXZlIHNj cm9sbGJhciIgc3RhdGUgd2l0aGluIEZyYW1lVmlldyBpbmRlcGVuZGVudGx5IG9mIHRoZQorICAg ICAgICBpbmRpdmlkdWFsIHNjcm9sbGJhciBzdGF0ZXMgaW4gU2Nyb2xsVmlldy4KKworICAgICAg ICByZGFyOi8vcHJvYmxlbS83MjE1MTMyLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjkxNjcKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9z ZXMgc2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9mCisgICAgICAgIGVkaXQgbW9kZS4KKwor ICAgICAgICByZGFyOi8vcHJvYmxlbS83MzE0NDIxLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzA1MTcKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogRXh0cmEg c2Nyb2xsIGJhcnMgaW4gR2FyYWdlQmFuZCBMZXNzb24gU3RvcmUuCisKKyAgICAgICAgVGVzdDog ZmFzdC9vdmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbAorCisgICAgICAgICogQXBpL3F3 ZWJmcmFtZS5jcHA6CisgICAgICAgIChRV2ViRnJhbWU6OnNldFNjcm9sbEJhclBvbGljeSk6CisK IDIwMDktMTEtMDUgIFNodSBDaGFuZyAgPENoYW5nLlNodUBub2tpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYktpdC9xdC9BcGkvcXdlYmZy YW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAJKHJldmlz aW9uIDUwNjAxKQorKysgV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC04NjcsMTEgKzg2NywxMyBAQCB2b2lkIFFXZWJGcmFtZTo6c2V0U2Nyb2xsQmFyUG9saWN5 KFF0OjpPCiAgICAgICAgIGQtPmhvcml6b250YWxTY3JvbGxCYXJQb2xpY3kgPSBwb2xpY3k7CiAg ICAgICAgIGlmIChkLT5mcmFtZS0+dmlldygpKSB7CiAgICAgICAgICAgICBkLT5mcmFtZS0+dmll dygpLT5zZXRIb3Jpem9udGFsU2Nyb2xsYmFyTW9kZSgoU2Nyb2xsYmFyTW9kZSlwb2xpY3kpOwor ICAgICAgICAgICAgZC0+ZnJhbWUtPnZpZXcoKS0+dXBkYXRlQ2FuSGF2ZVNjcm9sbGJhcnMoKTsK ICAgICAgICAgfQogICAgIH0gZWxzZSB7CiAgICAgICAgIGQtPnZlcnRpY2FsU2Nyb2xsQmFyUG9s aWN5ID0gcG9saWN5OwogICAgICAgICBpZiAoZC0+ZnJhbWUtPnZpZXcoKSkgewogICAgICAgICAg ICAgZC0+ZnJhbWUtPnZpZXcoKS0+c2V0VmVydGljYWxTY3JvbGxiYXJNb2RlKChTY3JvbGxiYXJN b2RlKXBvbGljeSk7CisgICAgICAgICAgICBkLT5mcmFtZS0+dmlldygpLT51cGRhdGVDYW5IYXZl U2Nyb2xsYmFycygpOwogICAgICAgICB9CiAgICAgfQogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNTA2 MDEpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NyBAQAorMjAwOS0xMS0wNiAgTWFyayBNZW50b3ZhaSAgPG1hcmtAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzcyMTUxMzIsIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2 NworICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBtaW50LmNvbSBsb3NlcyBzY3JvbGxiYXJz IGFmdGVyIGNvbWluZyBvdXQgb2YKKyAgICAgICAgZWRpdCBtb2RlLgorCisgICAgICAgIHJkYXI6 Ly9wcm9ibGVtLzczMTQ0MjEsIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMDUxNworICAgICAgICBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFycyBp biBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4KKworICAgICAgICAqIGZhc3Qvb3ZlcmZsb3cvc2Ny b2xsYmFyLXJlc3RvcmVkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9vdmVy Zmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbDogQWRkZWQuCisKIDIwMDktMTEtMDQgIFNoaW5p Y2hpcm8gSGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Nyb2xsYmFy LXJlc3RvcmVkLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNSBAQAorVGVzdCBmb3IgcmRhcjovL3Byb2JsZW0vNzIx NTEzMiwgYnVnIDI5MTY3LCBSRUdSRVNTSU9OIChyNDgwNjQpOiBtaW50LmNvbSBsb3NlcyBzY3Jv bGxiYXJzIGFmdGVyIGNvbWluZyBvdXQgb2YgZWRpdCBtb2RlLCBhbmQgcmRhcjovL3Byb2JsZW0v NzMxNDQyMSwgYnVnIDMwNTE3LCBSRUdSRVNTSU9OIChyNDgwNjQpOiBFeHRyYSBzY3JvbGwgYmFy cyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZS4KKworVGhpcyB0ZXN0cyB0aGF0IGFmdGVyIHNl dHRpbmcgJ292ZXJmbG93JyBvbiB0aGUgZG9jdW1lbnQgZWxlbWVudCB0byAnaGlkZGVuJyBhbmQg YmFjayB0byAndmlzaWJsZScsIHNjcm9sbGJhcnMgYXBwZWFyIGFzIG5lY2Vzc2FyeS4KKworUEFT UwoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9vdmVyZmxvdy9zY3JvbGxi YXItcmVzdG9yZWQtZXhwZWN0ZWQudHh0Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjplb2wtc3R5bGUK ICAgKyBuYXRpdmUKCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L292ZXJmbG93L3Njcm9sbGJhci1y ZXN0b3JlZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvb3ZlcmZsb3cvc2Ny b2xsYmFyLXJlc3RvcmVkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L292 ZXJmbG93L3Njcm9sbGJhci1yZXN0b3JlZC5odG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDI5 IEBACis8Ym9keT4KKyAgICA8cD4KKyAgICAgICAgVGVzdCBmb3IgPGk+PGEgaHJlZj0icmRhcjov L3Byb2JsZW0vNzIxNTEzMiI+cmRhcjovL3Byb2JsZW0vNzIxNTEzMjwvYT4sCisgICAgICAgIDxh IGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTE2NyI+YnVn IDI5MTY3PC9hPiwKKyAgICAgICAgUkVHUkVTU0lPTiAocjQ4MDY0KTogbWludC5jb20gbG9zZXMg c2Nyb2xsYmFycyBhZnRlciBjb21pbmcgb3V0IG9mIGVkaXQgbW9kZTwvaT4sCisgICAgICAgIGFu ZCA8aT48YSBocmVmPSJyZGFyOi8vcHJvYmxlbS83MzE0NDIxIj5yZGFyOi8vcHJvYmxlbS83MzE0 NDIxPC9hPiwKKyAgICAgICAgPGEgaHJlZj0iaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTMwNTE3Ij5idWcgMzA1MTc8L2E+LAorICAgICAgICBSRUdSRVNTSU9OIChyNDgw NjQpOiBFeHRyYSBzY3JvbGwgYmFycyBpbiBHYXJhZ2VCYW5kIExlc3NvbiBTdG9yZTwvaT4uCisg ICAgPC9wPgorICAgIDxwPgorICAgICAgICBUaGlzIHRlc3RzIHRoYXQgYWZ0ZXIgc2V0dGluZyAn b3ZlcmZsb3cnIG9uIHRoZSBkb2N1bWVudCBlbGVtZW50IHRvCisgICAgICAgICdoaWRkZW4nIGFu ZCBiYWNrIHRvICd2aXNpYmxlJywgc2Nyb2xsYmFycyBhcHBlYXIgYXMgbmVjZXNzYXJ5LgorICAg IDwvcD4KKyAgICA8cCBpZD0icmVzdWx0Ij5GQUlMOiBUZXN0IGRpZCBub3QgcnVuIHRvIGNvbXBs ZXRpb248L3A+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikKKyAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsK KworICAgICAgICBkb2N1bWVudC5kb2N1bWVudEVsZW1lbnQuc3R5bGUub3ZlcmZsb3cgPSAiaGlk ZGVuIjsKKyAgICAgICAgZG9jdW1lbnQuYm9keS5vZmZzZXRUb3A7CisgICAgICAgIGRvY3VtZW50 LmRvY3VtZW50RWxlbWVudC5zdHlsZS5yZW1vdmVQcm9wZXJ0eSgib3ZlcmZsb3ciKTsKKyAgICAg ICAgZG9jdW1lbnQuYm9keS5zdHlsZS5oZWlnaHQgPSAiMjAwJSI7CisgICAgICAgIHZhciByZXN1 bHQgPSAoaW5uZXJXaWR0aCA9PT0gZG9jdW1lbnQuZG9jdW1lbnRFbGVtZW50Lm9mZnNldFdpZHRo KQorICAgICAgICAgICAgPyAiRkFJTDogU2Nyb2xsYmFyIGRpZCBub3QgYXBwZWFyIGFmdGVyIHJl c2V0dGluZyAnb3ZlcmZsb3cnIgorICAgICAgICAgICAgOiAiUEFTUyIKKworICAgICAgICBkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgicmVzdWx0IikuaW5uZXJUZXh0ID0gcmVzdWx0OworICAgIDwv c2NyaXB0PgorPC9ib2R5PgoKUHJvcGVydHkgY2hhbmdlcyBvbjogTGF5b3V0VGVzdHMvZmFzdC9v dmVyZmxvdy9zY3JvbGxiYXItcmVzdG9yZWQuaHRtbApfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkFkZGVkOiBzdm46bWlt ZS10eXBlCiAgICsgdGV4dC9odG1sCkFkZGVkOiBzdm46ZW9sLXN0eWxlCiAgICsgbmF0aXZlCgo=