38418 2010-05-01 00:49:54 -0700 [Qt] REGRESSION: fixed elements don't behave correctly when composited (AC) 2010-06-11 15:33:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED DUPLICATE 33150 Qt P2 Normal --- 38744 1 noam webkit-unassigned benjamin hausmann kenneth oldest_to_newest 219702 0 noam 2010-05-01 00:49:54 -0700 This regression was probably introduced with some changes to the scrolling mechanism from a few weeks ago. some of the tests under LayoutTests/compositing/geometry now show red when they shouldn't. 219806 1 54864 noam 2010-05-02 03:01:02 -0700 Created attachment 54864 Fix This probably needs another set of eyes because it affects non-AC code paths as well. 219807 2 54865 noam 2010-05-02 03:02:12 -0700 Created attachment 54865 Re-upload 219898 3 hausmann 2010-05-02 14:14:44 -0700 It looks like this only covers the case for the main frame, but not if the same happens within a child frame. AFAICS in the mac code that's done per frame. I wonder if the right fix is cross-platform inside WebCore instead of going through the WebKit layer and then back into WebCore? 219901 4 noam 2010-05-02 14:25:39 -0700 I think it should be platform specific - there's no way for WebCore to know when the platform actually scrolled. 219903 5 hausmann 2010-05-02 14:30:53 -0700 (In reply to comment #4) > I think it should be platform specific - there's no way for WebCore to know > when the platform actually scrolled. Why not? In your patch you're modifying ChromeClient(Qt)::scroll, which _is_ cross-platform and the place where WebCore tells the platform to scroll. The other way around, when the upper application layer wants to scroll the WebCore::ScrollView, then it calls functions like scrollBy() inside WebCore. I must be missing something :) 219908 6 noam 2010-05-02 14:40:23 -0700 hmm, I guess you're right. But wouldn't that mess with the Apple implementation? 220403 7 noam 2010-05-03 18:09:57 -0700 I researched further: this has to be platform specific, as other platforms might choose to implement scrolling in an async way. scrollPoitionChanged() should be called after the async scroll operation actually took place. In Qt we do sync scrolling, so it happens that we can call scrollPositionChanged() directly - but that behavior is platform specific. Therefore, I can't think of a differrent/more appropriate way to do this than ChromeClientQt :) 233449 8 hausmann 2010-06-02 14:15:19 -0700 (In reply to comment #7) > I researched further: this has to be platform specific, as other platforms might choose to implement scrolling in an async way. scrollPoitionChanged() should be called after the async scroll operation actually took place. In Qt we do sync scrolling, so it happens that we can call scrollPositionChanged() directly - but that behavior is platform specific. > Therefore, I can't think of a differrent/more appropriate way to do this than ChromeClientQt :) You're right. Ok, what about the main frame vs. child frames point? :) 233465 9 57707 noam 2010-06-02 15:02:20 -0700 Created attachment 57707 Different approach How about this approach then (see new attachment). It's not for review yet, just discussion. 234775 10 57707 hausmann 2010-06-07 04:14:00 -0700 Comment on attachment 57707 Different approach I like this approach :) WebCore/platform/HostWindow.h:60 + // Returns true if The docs should give some more help, so that the other ports have an idea what to do here ;) 234776 11 54865 hausmann 2010-06-07 04:14:45 -0700 Comment on attachment 54865 Re-upload r- because of lack of frame handling, but the new patch looks promising :) 236584 12 noam 2010-06-10 16:53:10 -0700 What's missing for this to handle frames? It's implemented entirely in ScrollView so it should work for anything. 236585 13 noam 2010-06-10 16:54:19 -0700 Also, can we add it for the common use case and test frames later? I don't get the logic of "Let's reject a bug that fixes FOO because it doesn't fix BAR" :) No'am 236694 14 hausmann 2010-06-10 22:43:55 -0700 I think your third party is good, I like the approach. I r-'ed the second patch, because your third patch replaces it. Please add a changelog to the third one and put it up for review :) 236953 15 noam 2010-06-11 11:51:41 -0700 ah, I see. my misunderstanding. New patch coming up :) 236989 16 noam 2010-06-11 13:05:50 -0700 This was apparently fixed, see bug 33150. *** This bug has been marked as a duplicate of bug 33150 *** 237073 17 benjamin 2010-06-11 15:28:05 -0700 (In reply to comment #16) > This was apparently fixed, see bug 33150. > > *** This bug has been marked as a duplicate of bug 33150 *** I have not checked the bug but it looks unrelated to 33150. On scroll, the layers are updated via FrameView::scrollPositionChanged() See https://bugs.webkit.org/show_bug.cgi?id=36783 && https://bugs.webkit.org/show_bug.cgi?id=38286 https://bugs.webkit.org/show_bug.cgi?id=33150 improves performance but don't really change the behavior. 237077 18 noam 2010-06-11 15:33:43 -0700 It could have been 39918 then. The point is the bug is no longer there. 54864 2010-05-02 03:01:02 -0700 2010-05-02 03:02:12 -0700 Fix patch-38418.diff text/plain 3848 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0 LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NMYXllclF0LmNwcApp bmRleCAxYzRjMjc1Li5kZTc1ODFhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3F0L0dyYXBoaWNzTGF5ZXJRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0xheWVyUXQuY3BwCkBAIC02MDYsNyArNjA2LDcgQEAgdm9pZCBHcmFwaGlj c0xheWVyUXRJbXBsOjpmbHVzaENoYW5nZXMoYm9vbCByZWN1cnNpdmUsIGJvb2wgZm9yY2VVcGRh dGVUcmFuc2Zvcm0KIAogICAgIGlmIChtX21hc2tFZmZlY3QpCiAgICAgICAgIG1fbWFza0VmZmVj dC5kYXRhKCktPnVwZGF0ZSgpOwotICAgIGVsc2UgaWYgKG1fY2hhbmdlTWFzayAmIERpc3BsYXlD aGFuZ2UpIHsgICAgICAgIAorICAgIGVsc2UgaWYgKG1fY2hhbmdlTWFzayAmIERpc3BsYXlDaGFu Z2UpIHsKICAgICAgICAgLy8gUmVjYWNoZSBub3c6IGFsbCB0aGUgY29udGVudCBpcyByZWFkeSBh bmQgd2UgZG9uJ3Qgd2FudCB0byB3YWl0IHVudGlsIHRoZSBwYWludCBldmVudC4KICAgICAgICAg cmVjYWNoZShtX3BlbmRpbmdDb250ZW50LnJlZ2lvblRvVXBkYXRlKTsKICAgICAgICAgdXBkYXRl KG1fcGVuZGluZ0NvbnRlbnQucmVnaW9uVG9VcGRhdGUuYm91bmRpbmdSZWN0KCkpOwpkaWZmIC0t Z2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXggZmQ4 MDA1Ni4uNjY0NjgwOCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9XZWJL aXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDUtMDIgIE5vYW0gUm9zZW50 aGFsICA8bm9hbS5yb3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUkVHUkVTU0lPTjogZml4ZWQgZWxlbWVudHMg ZG9uJ3QgYmVoYXZlIGNvcnJlY3RseSB3aGVuIGNvbXBvc2l0ZWQgKEFDKQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzg0MTgKKworICAgICAgICBUaGlz IG9jY3VyZWQgYmVjYXVzZSBGcmFtZVZpZXc6OnNjcm9sbFBvc2l0aW9uQ2hhbmdlZCgpIGlzIG5l dmVyIGNhbGxlZCBpbiBRdC4KKyAgICAgICAgVGhhdCBmdW5jdGlvbiBuZWVkcyB0byBiZSBjYWxs ZWQgZnJvbSBwbGF0Zm9ybS1zcGVjaWZpYyBjb2RlOiBzZWUgV2ViSFRNTFZpZXcubW0uCisgICAg ICAgIFRoZSBmaXggY2FsbHMgdGhhdCBmdW5jdGlvbiB3aGVuIHRoZSBDaHJvbWVDbGllbnQgaXMg YWJvdXQgdG8gbm90aWZ5IHRoZSBwbGF0Zm9ybVBhZ2VDbGllbnQgaXQgbmVlZHMgdG8gc2Nyb2xs LgorCisgICAgICAgIFRlc3RlZCBieSBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9maXhlZC1wb3Np dGlvbi5odG1sCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6bm90aWZ5RnJhbWVPZlNjcm9sbFBv c2l0aW9uQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVudFF0OjppbnZhbGlk YXRlQ29udGVudHNGb3JTbG93U2Nyb2xsKToKKyAgICAgICAgKFdlYkNvcmU6OkNocm9tZUNsaWVu dFF0OjpzY3JvbGwpOgorICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0Lmg6 CisKIDIwMTAtMDUtMDIgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lh LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbi4K ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5jcHAg Yi9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCmluZGV4IGNmMTAw ZjcuLmUxZThlZDEgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRRdC5jcHAKKysrIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0 LmNwcApAQCAtMzkyLDE1ICszOTIsMjcgQEAgdm9pZCBDaHJvbWVDbGllbnRRdDo6aW52YWxpZGF0 ZUNvbnRlbnRzQW5kV2luZG93KGNvbnN0IEludFJlY3QmIHdpbmRvd1JlY3QsIGJvb2wKICAgICAv LyBpcyBzZXQuCiB9CiAKK3ZvaWQgQ2hyb21lQ2xpZW50UXQ6Om5vdGlmeUZyYW1lT2ZTY3JvbGxQ b3NpdGlvbkNoYW5nZSgpCit7CisgICAgLy8gV2UgaGF2ZSB0byBtYWtlIHN1cmUgV2ViQ29yZTo6 RnJhbWVWaWV3IGtub3dzIHdoZW4gdGhlIHZpZXcgYWN0dWFsbHkgc2Nyb2xscy4gU2VlIHRoZSBN YWMgaW1wbGVtZW50YXRpb24sIF91cGRhdGVNb3VzZW92ZXJUaW1lckNhbGxiYWNrLgorICAgIC8v IFRoZSBwbGF0Zm9ybSBpcyByZXNwb25zaWJsZSB0byBtYWtlIHRoaXMgY2FsbC4KKyAgICBtX3dl YlBhZ2UtPm1haW5GcmFtZSgpLT5kLT5mcmFtZS0+dmlldygpLT5zY3JvbGxQb3NpdGlvbkNoYW5n ZWQoKTsKK30KKwogdm9pZCBDaHJvbWVDbGllbnRRdDo6aW52YWxpZGF0ZUNvbnRlbnRzRm9yU2xv d1Njcm9sbChjb25zdCBJbnRSZWN0JiB3aW5kb3dSZWN0LCBib29sIGltbWVkaWF0ZSkKIHsKICAg ICBpbnZhbGlkYXRlQ29udGVudHNBbmRXaW5kb3cod2luZG93UmVjdCwgaW1tZWRpYXRlKTsKKyAg ICBub3RpZnlGcmFtZU9mU2Nyb2xsUG9zaXRpb25DaGFuZ2UoKTsKIH0KIAogdm9pZCBDaHJvbWVD bGllbnRRdDo6c2Nyb2xsKGNvbnN0IEludFNpemUmIGRlbHRhLCBjb25zdCBJbnRSZWN0JiBzY3Jv bGxWaWV3UmVjdCwgY29uc3QgSW50UmVjdCYpCiB7Ci0gICAgaWYgKHBsYXRmb3JtUGFnZUNsaWVu dCgpKQorICAgIGlmIChwbGF0Zm9ybVBhZ2VDbGllbnQoKSkgewogICAgICAgICBwbGF0Zm9ybVBh Z2VDbGllbnQoKS0+c2Nyb2xsKGRlbHRhLndpZHRoKCksIGRlbHRhLmhlaWdodCgpLCBzY3JvbGxW aWV3UmVjdCk7CisgICAgICAgIC8vIFdlIG9ubHkgbm90aWZ5IHRoZSBGcmFtZVZpZXcgdGhhdCB0 aGUgc2Nyb2xsIHBvc2l0aW9uIGhhcyBjaGFuZ2VkIGlmIHdlIGhhdmUgYSBwbGF0Zm9ybVBhZ2VD bGllbnQuCisgICAgICAgIG5vdGlmeUZyYW1lT2ZTY3JvbGxQb3NpdGlvbkNoYW5nZSgpOworICAg IH0KKwogICAgIGVtaXQgbV93ZWJQYWdlLT5zY3JvbGxSZXF1ZXN0ZWQoZGVsdGEud2lkdGgoKSwg ZGVsdGEuaGVpZ2h0KCksIHNjcm9sbFZpZXdSZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvV2ViS2l0 L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmggYi9XZWJLaXQvcXQvV2ViQ29yZVN1 cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAppbmRleCBhNDU3NWUyLi5jYjQ3YjFmIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaAorKysgYi9XZWJLaXQv cXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaApAQCAtMTYxLDYgKzE2MSw3IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2aXJ0dWFsIHZvaWQgcmVxdWVzdEdlb2xvY2F0 aW9uUGVybWlzc2lvbkZvckZyYW1lKEZyYW1lKiwgR2VvbG9jYXRpb24qKTsKICAgICAgICAgdmly dHVhbCB2b2lkIGNhbmNlbEdlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RGb3JGcmFtZShGcmFt ZSosIEdlb2xvY2F0aW9uKikgeyB9CisgICAgICAgIHZvaWQgbm90aWZ5RnJhbWVPZlNjcm9sbFBv c2l0aW9uQ2hhbmdlKCk7CiAKICNpZiBFTkFCTEUoV0lER0VUU18xMF9TVVBQT1JUKQogICAgICAg ICB2aXJ0dWFsIGJvb2wgaXNXaW5kb3dlZCgpOwo= 54865 2010-05-02 03:02:12 -0700 2010-06-07 04:14:45 -0700 Re-upload patch-38418.diff text/plain 3114 noam ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hhbmdlTG9nCmlu ZGV4IGZkODAwNTYuLjY2NDY4MDggMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFuZ2VMb2cKKysr IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEwLTA1LTAyICBOb2Ft IFJvc2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFJFR1JFU1NJT046IGZpeGVkIGVs ZW1lbnRzIGRvbid0IGJlaGF2ZSBjb3JyZWN0bHkgd2hlbiBjb21wb3NpdGVkIChBQykKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM4NDE4CisKKyAgICAg ICAgVGhpcyBvY2N1cmVkIGJlY2F1c2UgRnJhbWVWaWV3OjpzY3JvbGxQb3NpdGlvbkNoYW5nZWQo KSBpcyBuZXZlciBjYWxsZWQgaW4gUXQuCisgICAgICAgIFRoYXQgZnVuY3Rpb24gbmVlZHMgdG8g YmUgY2FsbGVkIGZyb20gcGxhdGZvcm0tc3BlY2lmaWMgY29kZTogc2VlIFdlYkhUTUxWaWV3Lm1t LgorICAgICAgICBUaGUgZml4IGNhbGxzIHRoYXQgZnVuY3Rpb24gd2hlbiB0aGUgQ2hyb21lQ2xp ZW50IGlzIGFib3V0IHRvIG5vdGlmeSB0aGUgcGxhdGZvcm1QYWdlQ2xpZW50IGl0IG5lZWRzIHRv IHNjcm9sbC4KKworICAgICAgICBUZXN0ZWQgYnkgTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZml4 ZWQtcG9zaXRpb24uaHRtbAorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50UXQ6Om5vdGlmeUZyYW1lT2ZT Y3JvbGxQb3NpdGlvbkNoYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpDaHJvbWVDbGllbnRRdDo6 aW52YWxpZGF0ZUNvbnRlbnRzRm9yU2xvd1Njcm9sbCk6CisgICAgICAgIChXZWJDb3JlOjpDaHJv bWVDbGllbnRRdDo6c2Nyb2xsKToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGll bnRRdC5oOgorCiAyMDEwLTA1LTAyICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW4ucG91bGFp bkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3Rp YW5zZW4uCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50 UXQuY3BwIGIvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAppbmRl eCBjZjEwMGY3Li5lMWU4ZWQxIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQv Q2hyb21lQ2xpZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVD bGllbnRRdC5jcHAKQEAgLTM5MiwxNSArMzkyLDI3IEBAIHZvaWQgQ2hyb21lQ2xpZW50UXQ6Omlu dmFsaWRhdGVDb250ZW50c0FuZFdpbmRvdyhjb25zdCBJbnRSZWN0JiB3aW5kb3dSZWN0LCBib29s CiAgICAgLy8gaXMgc2V0LgogfQogCit2b2lkIENocm9tZUNsaWVudFF0Ojpub3RpZnlGcmFtZU9m U2Nyb2xsUG9zaXRpb25DaGFuZ2UoKQoreworICAgIC8vIFdlIGhhdmUgdG8gbWFrZSBzdXJlIFdl YkNvcmU6OkZyYW1lVmlldyBrbm93cyB3aGVuIHRoZSB2aWV3IGFjdHVhbGx5IHNjcm9sbHMuIFNl ZSB0aGUgTWFjIGltcGxlbWVudGF0aW9uLCBfdXBkYXRlTW91c2VvdmVyVGltZXJDYWxsYmFjay4K KyAgICAvLyBUaGUgcGxhdGZvcm0gaXMgcmVzcG9uc2libGUgdG8gbWFrZSB0aGlzIGNhbGwuCisg ICAgbV93ZWJQYWdlLT5tYWluRnJhbWUoKS0+ZC0+ZnJhbWUtPnZpZXcoKS0+c2Nyb2xsUG9zaXRp b25DaGFuZ2VkKCk7Cit9CisKIHZvaWQgQ2hyb21lQ2xpZW50UXQ6OmludmFsaWRhdGVDb250ZW50 c0ZvclNsb3dTY3JvbGwoY29uc3QgSW50UmVjdCYgd2luZG93UmVjdCwgYm9vbCBpbW1lZGlhdGUp CiB7CiAgICAgaW52YWxpZGF0ZUNvbnRlbnRzQW5kV2luZG93KHdpbmRvd1JlY3QsIGltbWVkaWF0 ZSk7CisgICAgbm90aWZ5RnJhbWVPZlNjcm9sbFBvc2l0aW9uQ2hhbmdlKCk7CiB9CiAKIHZvaWQg Q2hyb21lQ2xpZW50UXQ6OnNjcm9sbChjb25zdCBJbnRTaXplJiBkZWx0YSwgY29uc3QgSW50UmVj dCYgc2Nyb2xsVmlld1JlY3QsIGNvbnN0IEludFJlY3QmKQogewotICAgIGlmIChwbGF0Zm9ybVBh Z2VDbGllbnQoKSkKKyAgICBpZiAocGxhdGZvcm1QYWdlQ2xpZW50KCkpIHsKICAgICAgICAgcGxh dGZvcm1QYWdlQ2xpZW50KCktPnNjcm9sbChkZWx0YS53aWR0aCgpLCBkZWx0YS5oZWlnaHQoKSwg c2Nyb2xsVmlld1JlY3QpOworICAgICAgICAvLyBXZSBvbmx5IG5vdGlmeSB0aGUgRnJhbWVWaWV3 IHRoYXQgdGhlIHNjcm9sbCBwb3NpdGlvbiBoYXMgY2hhbmdlZCBpZiB3ZSBoYXZlIGEgcGxhdGZv cm1QYWdlQ2xpZW50LgorICAgICAgICBub3RpZnlGcmFtZU9mU2Nyb2xsUG9zaXRpb25DaGFuZ2Uo KTsKKyAgICB9CisKICAgICBlbWl0IG1fd2ViUGFnZS0+c2Nyb2xsUmVxdWVzdGVkKGRlbHRhLndp ZHRoKCksIGRlbHRhLmhlaWdodCgpLCBzY3JvbGxWaWV3UmVjdCk7CiB9CiAKZGlmZiAtLWdpdCBh L1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5oIGIvV2ViS2l0L3F0L1dl YkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKaW5kZXggYTQ1NzVlMi4uY2I0N2IxZiAxMDA2 NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKKysrIGIv V2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmgKQEAgLTE2MSw2ICsxNjEs NyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgdmlydHVhbCB2b2lkIHJlcXVlc3RH ZW9sb2NhdGlvblBlcm1pc3Npb25Gb3JGcmFtZShGcmFtZSosIEdlb2xvY2F0aW9uKik7CiAgICAg ICAgIHZpcnR1YWwgdm9pZCBjYW5jZWxHZW9sb2NhdGlvblBlcm1pc3Npb25SZXF1ZXN0Rm9yRnJh bWUoRnJhbWUqLCBHZW9sb2NhdGlvbiopIHsgfQorICAgICAgICB2b2lkIG5vdGlmeUZyYW1lT2ZT Y3JvbGxQb3NpdGlvbkNoYW5nZSgpOwogCiAjaWYgRU5BQkxFKFdJREdFVFNfMTBfU1VQUE9SVCkK ICAgICAgICAgdmlydHVhbCBib29sIGlzV2luZG93ZWQoKTsK 57707 2010-06-02 15:02:20 -0700 2010-06-07 04:14:00 -0700 Different approach patch-38418-2.diff text/plain 3596 noam ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9DaHJvbWUuY3BwIGIvV2ViQ29yZS9wYWdlL0Nocm9t ZS5jcHAKaW5kZXggMDEyNDIxMS4uOTc4MmJmMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wYWdlL0No cm9tZS5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL0Nocm9tZS5jcHAKQEAgLTQ0MSw2ICs0NDEsMTEg QEAgYm9vbCBDaHJvbWU6OnNldEN1cnNvcihQbGF0Zm9ybUN1cnNvckhhbmRsZSBjdXJzb3IpCiAg ICAgcmV0dXJuIG1fY2xpZW50LT5zZXRDdXJzb3IoY3Vyc29yKTsKIH0KIAorYm9vbCBDaHJvbWU6 OnNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hhbmdlKCkgY29uc3QKK3sKKyAgICBy ZXR1cm4gbV9jbGllbnQtPnNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hhbmdlKCk7 Cit9CisKICNpZiBFTkFCTEUoTk9USUZJQ0FUSU9OUykKIE5vdGlmaWNhdGlvblByZXNlbnRlciog Q2hyb21lOjpub3RpZmljYXRpb25QcmVzZW50ZXIoKSBjb25zdAogewpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wYWdlL0Nocm9tZS5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZS5oCmluZGV4IDg4MDM1YTUu LjRkMGE1MTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWUuaAorKysgYi9XZWJDb3Jl L3BhZ2UvQ2hyb21lLmgKQEAgLTcxLDYgKzcxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAg ICAgICB2aXJ0dWFsIHZvaWQgc2Nyb2xsYmFyc01vZGVEaWRDaGFuZ2UoKSBjb25zdDsKIAogICAg ICAgICB2b2lkIHNjcm9sbFJlY3RJbnRvVmlldyhjb25zdCBJbnRSZWN0JikgY29uc3Q7CisgICAg ICAgIHZpcnR1YWwgYm9vbCBzaG91bGRBbHdheXNIYW5kbGVTY3JvbGxQb3NpdGlvbkNoYW5nZSgp IGNvbnN0OwogCiAgICAgICAgIHZvaWQgY29udGVudHNTaXplQ2hhbmdlZChGcmFtZSosIGNvbnN0 IEludFNpemUmKSBjb25zdDsKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVu dC5oIGIvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCmluZGV4IGM5M2IzYzkuLmZiNTc1NzIg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysgYi9XZWJDb3JlL3Bh Z2UvQ2hyb21lQ2xpZW50LmgKQEAgLTIyMyw2ICsyMjMsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIHZpcnR1YWwgdm9pZCBlbnRlckZ1bGxzY3JlZW5Gb3JOb2RlKE5vZGUqKSB7IH0K ICAgICAgICAgdmlydHVhbCB2b2lkIGV4aXRGdWxsc2NyZWVuRm9yTm9kZShOb2RlKikgeyB9CiAK KyAgICAgICAgdmlydHVhbCBib29sIHNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hh bmdlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KKwogI2lmIEVOQUJMRShUSUxFRF9CQUNLSU5H X1NUT1JFKQogICAgICAgICB2aXJ0dWFsIEludFJlY3QgdmlzaWJsZVJlY3RGb3JUaWxlZEJhY2tp bmdTdG9yZSgpIGNvbnN0IHsgcmV0dXJuIEludFJlY3QoKTsgfQogI2VuZGlmCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL0hvc3RXaW5kb3cuaCBiL1dlYkNvcmUvcGxhdGZvcm0vSG9zdFdp bmRvdy5oCmluZGV4IGU3MzE2YTcuLjA1MzJmMTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZv cm0vSG9zdFdpbmRvdy5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vSG9zdFdpbmRvdy5oCkBAIC01 Niw2ICs1Niw5IEBAIHB1YmxpYzoKICAgICAKICAgICAvLyBUbyBub3RpZnkgV2ViS2l0IG9mIHNj cm9sbGJhciBtb2RlIGNoYW5nZXMuCiAgICAgdmlydHVhbCB2b2lkIHNjcm9sbGJhcnNNb2RlRGlk Q2hhbmdlKCkgY29uc3QgPSAwOworCisgICAgLy8gUmV0dXJucyB0cnVlIGlmCisgICAgdmlydHVh bCBib29sIHNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hhbmdlKCkgY29uc3QgPSAw OwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5jcHAKaW5k ZXggMjkxYzQ0OS4uYWRiNDZlYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxW aWV3LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL1Njcm9sbFZpZXcuY3BwCkBAIC01MjAsNiAr NTIwLDkgQEAgdm9pZCBTY3JvbGxWaWV3OjpzY3JvbGxDb250ZW50cyhjb25zdCBJbnRTaXplJiBz Y3JvbGxEZWx0YSkKICAgICAgICBob3N0V2luZG93KCktPmludmFsaWRhdGVDb250ZW50c0ZvclNs b3dTY3JvbGwodXBkYXRlUmVjdCwgZmFsc2UpOwogICAgIH0KIAorICAgIGlmIChob3N0V2luZG93 KCktPnNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hhbmdlKCkpCisgICAgICAgIHNj cm9sbFBvc2l0aW9uQ2hhbmdlZCgpOworCiAgICAgLy8gVGhpcyBjYWxsIHdpbGwgbW92ZSBjaGls ZHJlbiB3aXRoIG5hdGl2ZSB3aWRnZXRzIChwbHVnaW5zKSBhbmQgaW52YWxpZGF0ZSB0aGVtIGFz IHdlbGwuCiAgICAgZnJhbWVSZWN0c0NoYW5nZWQoKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0 L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcCBiL1dlYktpdC9xdC9XZWJDb3JlU3Vw cG9ydC9DaHJvbWVDbGllbnRRdC5jcHAKaW5kZXggYmNiMDdlZS4uMTg3MjZhNiAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0Nocm9tZUNsaWVudFF0LmNwcAorKysgYi9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuY3BwCkBAIC01NjcsNyArNTY3LDEy IEBAIGJvb2wgQ2hyb21lQ2xpZW50UXQ6OmFsbG93c0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcoKSBj b25zdAogfQogCiAjZW5kaWYKLSAgICAKKworYm9vbCBDaHJvbWVDbGllbnRRdDo6c2hvdWxkQWx3 YXlzSGFuZGxlU2Nyb2xsUG9zaXRpb25DaGFuZ2UoKSBjb25zdAoreworICAgIHJldHVybiB0cnVl OworfQorCiAjaWYgRU5BQkxFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiBJbnRSZWN0IENocm9tZUNs aWVudFF0Ojp2aXNpYmxlUmVjdEZvclRpbGVkQmFja2luZ1N0b3JlKCkgY29uc3QKIHsgCmRpZmYg LS1naXQgYS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvQ2hyb21lQ2xpZW50UXQuaCBiL1dlYktp dC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5oCmluZGV4IDAzOTZhZWYuLmY3MDAx MmMgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5o CisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9DaHJvbWVDbGllbnRRdC5oCkBAIC0xNjYs NiArMTY2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIHZpcnR1YWwgdm9pZCBy ZXF1ZXN0R2VvbG9jYXRpb25QZXJtaXNzaW9uRm9yRnJhbWUoRnJhbWUqLCBHZW9sb2NhdGlvbiop OwogICAgICAgICB2aXJ0dWFsIHZvaWQgY2FuY2VsR2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVz dEZvckZyYW1lKEZyYW1lKiwgR2VvbG9jYXRpb24qKSB7IH0KKyAgICAgICAgdmlydHVhbCBib29s IHNob3VsZEFsd2F5c0hhbmRsZVNjcm9sbFBvc2l0aW9uQ2hhbmdlKCkgY29uc3Q7CiAKICNpZiBF TkFCTEUoV0lER0VUU18xMF9TVVBQT1JUKQogICAgICAgICB2aXJ0dWFsIGJvb2wgaXNXaW5kb3dl ZCgpOwo=