86239 2012-05-11 11:54:41 -0700 REGRESSION (r114170): Scroll areas in nested frames improperly placed when tiled drawing is enabled 2012-05-11 19:01:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jeffrey+webkit jeffrey+webkit andersca jamesr tonikitoo webkit.review.bot oldest_to_newest 621848 0 jeffrey+webkit 2012-05-11 11:54:41 -0700 When tiled drawing is enabled, scroll areas in nested frames (e.g. iframes) are placed as though the frame is located at 0,0. This causes wheel scrolling to be broken when the frames are not at 0,0. <rdar://problem/11338017> 621851 1 141462 jeffrey+webkit 2012-05-11 11:57:39 -0700 Created attachment 141462 Patch 622013 2 141507 jeffrey+webkit 2012-05-11 15:17:54 -0700 Created attachment 141507 Patch This one should apply against ToT 622018 3 webkit.review.bot 2012-05-11 15:22:59 -0700 Attachment 141507 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'ChangeLog', u'Source/WebCore/ChangeLog']" exit_code: 1 Source/WebCore/ChangeLog:11: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Source/WebCore/ChangeLog:12: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 2 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 622065 4 141519 jeffrey+webkit 2012-05-11 15:57:06 -0700 Created attachment 141519 Patch 622072 5 141519 simon.fraser 2012-05-11 16:04:41 -0700 Comment on attachment 141519 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141519&action=review > Source/WebCore/ChangeLog:10 > + Scroll areas in nested frames improperly placed when tiled drawing is enabled > + https://bugs.webkit.org/show_bug.cgi?id=86239 > + > + Reviewed by NOBODY (OOPS!). > + > + Iteratively add positions of parent frames to placement of nested frame scroll areas. > + > + Manual tests: ManualTests/scrollable-positioned-frame.html This needs more explanation of what broke it and why this fix helps. > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:124 > + for (Frame* nestedFrame = frame; owner; nestedFrame = owner->document()->frame(), owner = nestedFrame->ownerElement()) > + if (owner->renderPart()) > + offset.moveBy(owner->renderPart()->widget()->frameRect().location()); Weird indentation here. You want { } around the two lines. 622109 6 141526 jeffrey+webkit 2012-05-11 16:36:45 -0700 Created attachment 141526 Patch 622113 7 141526 darin 2012-05-11 16:43:59 -0700 Comment on attachment 141526 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141526&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:125 > + IntPoint offset; > + HTMLFrameOwnerElement* owner = frame->ownerElement(); > + for (Frame* nestedFrame = frame; owner; nestedFrame = owner->document()->frame(), owner = nestedFrame->ownerElement()) { > + if (owner->renderPart()) > + offset.moveBy(owner->renderPart()->widget()->frameRect().location()); > + } Do we have an existing coordinate conversion function that could be used instead of this loop? The loop is OK with me, but I am a bit surprised to see it. What guarantee do we have that widget() is non-zero? 622167 8 141539 jeffrey+webkit 2012-05-11 18:13:57 -0700 Created attachment 141539 Patch 622173 9 141539 andersca 2012-05-11 18:20:57 -0700 Comment on attachment 141539 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141539&action=review > Source/WebCore/page/scrolling/ScrollingCoordinator.cpp:110 > +static Region computeNonFastScrollableRegion(Frame* frame, const IntPoint& parentCorner = IntPoint()) Instead of "parentCorner" I'd call this frameLocation, since corner could be any of the four frame corners :) Also, don't use a default argument here. It's better to just pass IntPoint() at the call site. 622182 10 jeffrey+webkit 2012-05-11 19:01:23 -0700 Committed r116832: <http://trac.webkit.org/changeset/116832> 141462 2012-05-11 11:57:39 -0700 2012-05-11 15:17:54 -0700 Patch rdar11338017.patch text/plain 5232 jeffrey+webkit ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA0M2Q0YTU3Li4xNzJhOTEx IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTItMDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBT Y3JvbGwgYXJlYXMgaW4gbmVzdGVkIGZyYW1lcyBpbXByb3Blcmx5IHBsYWNlZCB3aGVuIHRpbGVk IGRyYXdpbmcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODYyMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1hbnVhbFRlc3RzL3Jlc291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUu aHRtbDogQWRkZWQuCisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVk LW5lc3RlZC1mcmFtZS5odG1sOiBBZGRlZC4KKwogMjAxMi0wNS0wNyAgTGlhbSBRdWlubiAgPGxx dWlubkByaW0uY29tPgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBXV1ctQXV0aGVudGljYXRlIGhl YWRlciBvbiAyMDAgcmVzcG9uc2UgcG9wcyB1cCBhdXRoZW50aWNhdGlvbiBkaWFsb2cKZGlmZiAt LWdpdCBhL01hbnVhbFRlc3RzL3Jlc291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sIGIvTWFudWFs VGVzdHMvcmVzb3VyY2VzL2ZyYW1lLXRleHRhcmVhLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMC4uNTRhM2UwOQotLS0gL2Rldi9udWxsCisrKyBiL01hbnVhbFRlc3RzL3Jl c291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sCkBAIC0wLDAgKzEsOSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxib2R5PgorICA8dGV4dGFyZWE+TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFt ZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdC4gUGVsbGVudGVzcXVlIG51bGxhIGVzdCwg dGluY2lkdW50IHBoYXJldHJhIGhlbmRyZXJpdCBuZWMsIHVsdHJpY2VzIG5vbiBtaS4gRnVzY2Ug ZmV1Z2lhdCB0ZW1wdXMgbW9sbGlzLiBOdWxsYSBzYXBpZW4gYXVndWUsIGlhY3VsaXMgc2l0IGFt ZXQgb3JuYXJlIHZpdGFlLCB1bHRyaWNpZXMgbm9uIGFudGUuIEFsaXF1YW0gZGlnbmlzc2ltIHBv cnRhIGRvbG9yLCBhYyBsYW9yZWV0IGxlY3R1cyBmYXVjaWJ1cyBhYy4gUGhhc2VsbHVzIGx1Y3R1 cyBlcm9zIGluIGVyYXQgZmVybWVudHVtIHJob25jdXMuIEN1bSBzb2NpaXMgbmF0b3F1ZSBwZW5h dGlidXMgZXQgbWFnbmlzIGRpcyBwYXJ0dXJpZW50IG1vbnRlcywgbmFzY2V0dXIgcmlkaWN1bHVz IG11cy4gRG9uZWMgdmVuZW5hdGlzIGJpYmVuZHVtIHF1YW0uCisKK0NyYXMgdmVsIHRlbGx1cyB0 ZWxsdXMsIGFjY3Vtc2FuIG1hbGVzdWFkYSBlcmF0LiBNYXVyaXMgdGluY2lkdW50IGZlcm1lbnR1 bSBtYXNzYSBzaXQgYW1ldCBvcm5hcmUuIFNlZCBwZWxsZW50ZXNxdWUgdWx0cmljZXMgc2FwaWVu LCBub24gY3Vyc3VzIGZlbGlzIHZlc3RpYnVsdW0gaWQuIEludGVnZXIgdml0YWUgZW5pbSBuZWMg bGFjdXMgaGVuZHJlcml0IGNvbnNlcXVhdCBpZCBpbiBwdXJ1cy4gU3VzcGVuZGlzc2UgcG9ydGEs IGVuaW0gbmVjIGNvbmd1ZSBhdWN0b3IsIG5pc2kgYXVndWUgdnVscHV0YXRlIG1hZ25hLCBldSBz b2xsaWNpdHVkaW4gZWxpdCBmZWxpcyBpZCBlcmF0LiBDdXJhYml0dXIgaW4gYW50ZSBlbGl0LCBl dCBsb2JvcnRpcyBudWxsYS4gTG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVy IGFkaXBpc2NpbmcgZWxpdC4gQWVuZWFuIGdyYXZpZGEgb2RpbyBub24gbnVsbGEgcG9ydGEgY29u dmFsbGlzLgorICA8L3RleHRhcmVhPgorPC9ib2R5PgorPC9odG1sPgpcIE5vIG5ld2xpbmUgYXQg ZW5kIG9mIGZpbGUKZGlmZiAtLWdpdCBhL01hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25l ZC1mcmFtZS5odG1sIGIvTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVkLWZyYW1lLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTZmODBmMwotLS0gL2Rldi9u dWxsCisrKyBiL01hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1mcmFtZS5odG1sCkBA IC0wLDAgKzEsNyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorICA8cD5UaGUg Y29udGVudHMgb2YgdGhpcyBmcmFtZSBzaG91bGQgc2Nyb2xsIHdpdGggdGhlIG1vdXNlIHdoZWVs LjwvcD4KKyAgPGlmcmFtZSB3aWR0aD0yMDAgc2Nyb2xsaW5nPXllcyBzcmM9InJlc291cmNlcy9m cmFtZS10ZXh0YXJlYS5odG1sIiBzdHlsZT0icG9zaXRpb246Zml4ZWQ7IGxlZnQ6IDIwMHB4IiBp ZD0iZnJhbWUiPjwvaWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTWFudWFs VGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVkLW5lc3RlZC1mcmFtZS5odG1sIGIvTWFudWFsVGVz dHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVkLW5lc3RlZC1mcmFtZS5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRlNTNiYmIKLS0tIC9kZXYvbnVsbAorKysgYi9NYW51YWxU ZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtbmVzdGVkLWZyYW1lLmh0bWwKQEAgLTAsMCArMSw3 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+CisgIDxwPlRoZSBjb250ZW50cyBv ZiB0aGlzIGZyYW1lIHNob3VsZCBzY3JvbGwgd2l0aCB0aGUgbW91c2Ugd2hlZWwuPC9wPgorICA8 aWZyYW1lIHdpZHRoPTQwMCBzY3JvbGxpbmc9eWVzIHNyYz0ic2Nyb2xsYWJsZS1wb3NpdGlvbmVk LWZyYW1lLmh0bWwiIHN0eWxlPSJwb3NpdGlvbjpmaXhlZDsgbGVmdDogMjAwcHgiIGlkPSJmcmFt ZSI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjk2YzBlNC4uZGJh ODYwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEyLTA1LTExICBKZWZmcmV5IFBm YXUgIDxqcGZhdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2Nyb2xsIGFyZWFzIGluIG5lc3RlZCBm cmFtZXMgaW1wcm9wZXJseSBwbGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5nIGlzIGVuYWJsZWQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjM5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFudWFsIHRlc3Rz OgorICAgICAgICAqIE1hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1mcmFtZS5odG1s CisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVkLW5lc3RlZC1mcmFt ZS5odG1sCisKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlTm9uRmFzdFNjcm9sbGFibGVSZWdpb24pOgor CiAyMDEyLTA1LTA3ICBOYXQgRHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLCByb2xsaW5nIG91dCByMTE1NTI1LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDUzNzNmMDAu LjJjZjNlYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9s bGluZ0Nvb3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdDb29yZGluYXRvci5jcHAKQEAgLTI5LDExICsyOSwxMyBAQAogCiAjaW5jbHVkZSAi RnJhbWUuaCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJIVE1MRnJhbWVPd25l ckVsZW1lbnQuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2lu Y2x1ZGUgIlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgi CiAjaW5jbHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSAiUmVuZGVyUGFydC5oIgogI2luY2x1ZGUg IlJlbmRlclZpZXcuaCIKICNpbmNsdWRlICJTY3JvbGxBbmltYXRvci5oIgogI2luY2x1ZGUgIlNj cm9sbGluZ1RyZWVTdGF0ZS5oIgpAQCAtMTE4LDkgKzEyMCwxNyBAQCBzdGF0aWMgUmVnaW9uIGNv bXB1dGVOb25GYXN0U2Nyb2xsYWJsZVJlZ2lvbihGcmFtZSogbWFpbkZyYW1lKQogICAgICAgICBp ZiAoIXNjcm9sbGFibGVBcmVhcykKICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIElu dFBvaW50IG9mZnNldDsKKyAgICAgICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZy YW1lLT5vd25lckVsZW1lbnQoKTsKKyAgICAgICAgZm9yIChGcmFtZSogbmVzdGVkRnJhbWUgPSBm cmFtZTsgb3duZXI7IG5lc3RlZEZyYW1lID0gb3duZXItPmRvY3VtZW50KCktPmZyYW1lKCksIG93 bmVyID0gbmVzdGVkRnJhbWUtPm93bmVyRWxlbWVudCgpKQorICAgICAgICAgICAgaWYgKG93bmVy LT5yZW5kZXJQYXJ0KCkpCisgICAgICAgICAgICAgICAgb2Zmc2V0Lm1vdmVCeShvd25lci0+cmVu ZGVyUGFydCgpLT53aWRnZXQoKS0+ZnJhbWVSZWN0KCkubG9jYXRpb24oKSk7CisKICAgICAgICAg Zm9yIChGcmFtZVZpZXc6OlNjcm9sbGFibGVBcmVhU2V0Ojpjb25zdF9pdGVyYXRvciBpdCA9IHNj cm9sbGFibGVBcmVhcy0+YmVnaW4oKSwgZW5kID0gc2Nyb2xsYWJsZUFyZWFzLT5lbmQoKTsgaXQg IT0gZW5kOyArK2l0KSB7CiAgICAgICAgICAgICBTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFy ZWEgPSAqaXQ7Ci0gICAgICAgICAgICBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbi51bml0ZShzY3Jv bGxhYmxlQXJlYS0+c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpKTsKKyAgICAgICAgICAgIElu dFJlY3QgYm94ID0gc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goKTsK KyAgICAgICAgICAgIGJveC5tb3ZlQnkob2Zmc2V0KTsKKyAgICAgICAgICAgIG5vbkZhc3RTY3Jv bGxhYmxlUmVnaW9uLnVuaXRlKGJveCk7CiAgICAgICAgIH0KICAgICB9CiAK 141507 2012-05-11 15:17:54 -0700 2012-05-11 15:57:06 -0700 Patch rdar11338017.patch text/plain 1550 jeffrey+webkit ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5OTE5MzBkLi5jZjUwY2E0 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTItMDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBT Y3JvbGwgYXJlYXMgaW4gbmVzdGVkIGZyYW1lcyBpbXByb3Blcmx5IHBsYWNlZCB3aGVuIHRpbGVk IGRyYXdpbmcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODYyMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1hbnVhbFRlc3RzL3Jlc291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUu aHRtbDogQWRkZWQuCisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVk LW5lc3RlZC1mcmFtZS5odG1sOiBBZGRlZC4KKwogMjAxMi0wNS0xMSAgVG9tbXkgV2lkZW5mbHlj aHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBNZWRpYVN0cmVhbSBBUEk6IEZpeCBh IHJlZmVyZW5jZSBjb3VudGluZyBpc3N1ZSBpbiBVc2VyTWVkaWFSZXF1ZXN0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggN2FmMzU3OC4uODYwYWJiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA1 LTExICBKZWZmcmV5IFBmYXUgIDxqcGZhdUBhcHBsZS5jb20+CisKKyAgICAgICAgU2Nyb2xsIGFy ZWFzIGluIG5lc3RlZCBmcmFtZXMgaW1wcm9wZXJseSBwbGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5n IGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg2MjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgSXRlcmF0aXZlbHkgYWRkIHBvc2l0aW9ucyBvZiBwYXJlbnQgZnJhbWVzIHRvIHBsYWNlbWVu dCBvZiBuZXN0ZWQgZnJhbWUgc2Nyb2xsIGFyZWFzLgorCisgICAgICAgIE1hbnVhbCB0ZXN0czoK KyAgICAgICAgKiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRtbAor ICAgICAgICAqIE1hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUu aHRtbAorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZU5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKToKKwog MjAxMi0wNS0xMSAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAKICAg ICAgICAgW0NTUyBTaGFkZXJzXSBNYWtlIENTUyBTaGFkZXJzIHJlbmRlciB0byB0ZXh0dXJlIGZy YW1lYnVmZmVycwo= 141519 2012-05-11 15:57:06 -0700 2012-05-11 16:36:45 -0700 Patch rdar11338017.patch text/plain 5475 jeffrey+webkit ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5OTE5MzBkLi5jZjUwY2E0 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTItMDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBT Y3JvbGwgYXJlYXMgaW4gbmVzdGVkIGZyYW1lcyBpbXByb3Blcmx5IHBsYWNlZCB3aGVuIHRpbGVk IGRyYXdpbmcgaXMgZW5hYmxlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODYyMzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1hbnVhbFRlc3RzL3Jlc291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUu aHRtbDogQWRkZWQuCisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVk LW5lc3RlZC1mcmFtZS5odG1sOiBBZGRlZC4KKwogMjAxMi0wNS0xMSAgVG9tbXkgV2lkZW5mbHlj aHQgIDx0b21teXdAZ29vZ2xlLmNvbT4KIAogICAgICAgICBNZWRpYVN0cmVhbSBBUEk6IEZpeCBh IHJlZmVyZW5jZSBjb3VudGluZyBpc3N1ZSBpbiBVc2VyTWVkaWFSZXF1ZXN0CmRpZmYgLS1naXQg YS9NYW51YWxUZXN0cy9yZXNvdXJjZXMvZnJhbWUtdGV4dGFyZWEuaHRtbCBiL01hbnVhbFRlc3Rz L3Jlc291cmNlcy9mcmFtZS10ZXh0YXJlYS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLjU0YTNlMDkKLS0tIC9kZXYvbnVsbAorKysgYi9NYW51YWxUZXN0cy9yZXNvdXJj ZXMvZnJhbWUtdGV4dGFyZWEuaHRtbApAQCAtMCwwICsxLDkgQEAKKzwhRE9DVFlQRSBodG1sPgor PGh0bWw+Cis8Ym9keT4KKyAgPHRleHRhcmVhPkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBj b25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuIFBlbGxlbnRlc3F1ZSBudWxsYSBlc3QsIHRpbmNp ZHVudCBwaGFyZXRyYSBoZW5kcmVyaXQgbmVjLCB1bHRyaWNlcyBub24gbWkuIEZ1c2NlIGZldWdp YXQgdGVtcHVzIG1vbGxpcy4gTnVsbGEgc2FwaWVuIGF1Z3VlLCBpYWN1bGlzIHNpdCBhbWV0IG9y bmFyZSB2aXRhZSwgdWx0cmljaWVzIG5vbiBhbnRlLiBBbGlxdWFtIGRpZ25pc3NpbSBwb3J0YSBk b2xvciwgYWMgbGFvcmVldCBsZWN0dXMgZmF1Y2lidXMgYWMuIFBoYXNlbGx1cyBsdWN0dXMgZXJv cyBpbiBlcmF0IGZlcm1lbnR1bSByaG9uY3VzLiBDdW0gc29jaWlzIG5hdG9xdWUgcGVuYXRpYnVz IGV0IG1hZ25pcyBkaXMgcGFydHVyaWVudCBtb250ZXMsIG5hc2NldHVyIHJpZGljdWx1cyBtdXMu IERvbmVjIHZlbmVuYXRpcyBiaWJlbmR1bSBxdWFtLgorCitDcmFzIHZlbCB0ZWxsdXMgdGVsbHVz LCBhY2N1bXNhbiBtYWxlc3VhZGEgZXJhdC4gTWF1cmlzIHRpbmNpZHVudCBmZXJtZW50dW0gbWFz c2Egc2l0IGFtZXQgb3JuYXJlLiBTZWQgcGVsbGVudGVzcXVlIHVsdHJpY2VzIHNhcGllbiwgbm9u IGN1cnN1cyBmZWxpcyB2ZXN0aWJ1bHVtIGlkLiBJbnRlZ2VyIHZpdGFlIGVuaW0gbmVjIGxhY3Vz IGhlbmRyZXJpdCBjb25zZXF1YXQgaWQgaW4gcHVydXMuIFN1c3BlbmRpc3NlIHBvcnRhLCBlbmlt IG5lYyBjb25ndWUgYXVjdG9yLCBuaXNpIGF1Z3VlIHZ1bHB1dGF0ZSBtYWduYSwgZXUgc29sbGlj aXR1ZGluIGVsaXQgZmVsaXMgaWQgZXJhdC4gQ3VyYWJpdHVyIGluIGFudGUgZWxpdCwgZXQgbG9i b3J0aXMgbnVsbGEuIExvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlw aXNjaW5nIGVsaXQuIEFlbmVhbiBncmF2aWRhIG9kaW8gbm9uIG51bGxhIHBvcnRhIGNvbnZhbGxp cy4KKyAgPC90ZXh0YXJlYT4KKzwvYm9keT4KKzwvaHRtbD4KXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBmaWxlCmRpZmYgLS1naXQgYS9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJh bWUuaHRtbCBiL01hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1mcmFtZS5odG1sCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjU2ZjgwZjMKLS0tIC9kZXYvbnVsbAor KysgYi9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRtbApAQCAtMCww ICsxLDcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKyAgPHA+VGhlIGNvbnRl bnRzIG9mIHRoaXMgZnJhbWUgc2hvdWxkIHNjcm9sbCB3aXRoIHRoZSBtb3VzZSB3aGVlbC48L3A+ CisgIDxpZnJhbWUgd2lkdGg9MjAwIHNjcm9sbGluZz15ZXMgc3JjPSJyZXNvdXJjZXMvZnJhbWUt dGV4dGFyZWEuaHRtbCIgc3R5bGU9InBvc2l0aW9uOmZpeGVkOyBsZWZ0OiAyMDBweCIgaWQ9ImZy YW1lIj48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL01hbnVhbFRlc3Rz L3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUuaHRtbCBiL01hbnVhbFRlc3RzL3Nj cm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi40ZTUzYmJiCi0tLSAvZGV2L251bGwKKysrIGIvTWFudWFsVGVzdHMv c2Nyb2xsYWJsZS1wb3NpdGlvbmVkLW5lc3RlZC1mcmFtZS5odG1sCkBAIC0wLDAgKzEsNyBAQAor PCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxib2R5PgorICA8cD5UaGUgY29udGVudHMgb2YgdGhp cyBmcmFtZSBzaG91bGQgc2Nyb2xsIHdpdGggdGhlIG1vdXNlIHdoZWVsLjwvcD4KKyAgPGlmcmFt ZSB3aWR0aD00MDAgc2Nyb2xsaW5nPXllcyBzcmM9InNjcm9sbGFibGUtcG9zaXRpb25lZC1mcmFt ZS5odG1sIiBzdHlsZT0icG9zaXRpb246Zml4ZWQ7IGxlZnQ6IDIwMHB4IiBpZD0iZnJhbWUiPjwv aWZyYW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdhZjM1NzguLjU0NzY2ZmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wNS0xMSAgSmVmZnJleSBQZmF1ICA8 anBmYXVAYXBwbGUuY29tPgorCisgICAgICAgIFNjcm9sbCBhcmVhcyBpbiBuZXN0ZWQgZnJhbWVz IGltcHJvcGVybHkgcGxhY2VkIHdoZW4gdGlsZWQgZHJhd2luZyBpcyBlbmFibGVkCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjIzOQorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEl0ZXJhdGl2ZWx5IGFkZCBw b3NpdGlvbnMgb2YgcGFyZW50IGZyYW1lcyB0byBwbGFjZW1lbnQgb2YgbmVzdGVkIGZyYW1lIHNj cm9sbCBhcmVhcy4KKworICAgICAgICBNYW51YWwgdGVzdHM6IE1hbnVhbFRlc3RzL3Njcm9sbGFi bGUtcG9zaXRpb25lZC1mcmFtZS5odG1sCisgICAgICAgICAgICAgICAgICAgICAgTWFudWFsVGVz dHMvc2Nyb2xsYWJsZS1wb3NpdGlvbmVkLW5lc3RlZC1mcmFtZS5odG1sCisKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojpjb21wdXRlTm9uRmFzdFNjcm9sbGFibGVSZWdpb24pOgorCiAyMDEyLTA1LTExICBBbGV4YW5k cnUgQ2hpY3VsaXRhICA8YWNoaWN1QGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIFNoYWRlcnNd IE1ha2UgQ1NTIFNoYWRlcnMgcmVuZGVyIHRvIHRleHR1cmUgZnJhbWVidWZmZXJzCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5j cHAKaW5kZXggOWNmOTYxNS4uMzFlYWVkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcApAQCAtMjksMTEgKzI5LDEz IEBACiAKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lVmlldy5oIgorI2luY2x1 ZGUgIkhUTUxGcmFtZU93bmVyRWxlbWVudC5oIgogI2luY2x1ZGUgIkludFJlY3QuaCIKICNpbmNs dWRlICJQYWdlLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1XaGVlbEV2ZW50LmgiCiAjaW5jbHVkZSAi UGx1Z2luVmlld0Jhc2UuaCIKICNpbmNsdWRlICJSZWdpb24uaCIKKyNpbmNsdWRlICJSZW5kZXJQ YXJ0LmgiCiAjaW5jbHVkZSAiUmVuZGVyVmlldy5oIgogI2luY2x1ZGUgIlNjcm9sbEFuaW1hdG9y LmgiCiAjaW5jbHVkZSAiU2Nyb2xsaW5nVHJlZVN0YXRlLmgiCkBAIC0xMTUsOSArMTE3LDE3IEBA IHN0YXRpYyBSZWdpb24gY29tcHV0ZU5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uKEZyYW1lKiBtYWlu RnJhbWUpCiAgICAgICAgICAgICBjb250aW51ZTsKIAogICAgICAgICBpZiAoY29uc3QgRnJhbWVW aWV3OjpTY3JvbGxhYmxlQXJlYVNldCogc2Nyb2xsYWJsZUFyZWFzID0gZnJhbWVWaWV3LT5zY3Jv bGxhYmxlQXJlYXMoKSkgeworICAgICAgICAgICAgSW50UG9pbnQgb2Zmc2V0OworICAgICAgICAg ICAgSFRNTEZyYW1lT3duZXJFbGVtZW50KiBvd25lciA9IGZyYW1lLT5vd25lckVsZW1lbnQoKTsK KyAgICAgICAgICAgIGZvciAoRnJhbWUqIG5lc3RlZEZyYW1lID0gZnJhbWU7IG93bmVyOyBuZXN0 ZWRGcmFtZSA9IG93bmVyLT5kb2N1bWVudCgpLT5mcmFtZSgpLCBvd25lciA9IG5lc3RlZEZyYW1l LT5vd25lckVsZW1lbnQoKSkKKyAgICAgICAgICAgIGlmIChvd25lci0+cmVuZGVyUGFydCgpKQor ICAgICAgICAgICAgICAgIG9mZnNldC5tb3ZlQnkob3duZXItPnJlbmRlclBhcnQoKS0+d2lkZ2V0 KCktPmZyYW1lUmVjdCgpLmxvY2F0aW9uKCkpOworCiAgICAgICAgICAgICBmb3IgKEZyYW1lVmll dzo6U2Nyb2xsYWJsZUFyZWFTZXQ6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gc2Nyb2xsYWJsZUFyZWFz LT5iZWdpbigpLCBlbmQgPSBzY3JvbGxhYmxlQXJlYXMtPmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQp IHsKICAgICAgICAgICAgICAgICBTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFyZWEgPSAqaXQ7 Ci0gICAgICAgICAgICAgICAgbm9uRmFzdFNjcm9sbGFibGVSZWdpb24udW5pdGUoc2Nyb2xsYWJs ZUFyZWEtPnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goKSk7CisgICAgICAgICAgICAgICAgSW50 UmVjdCBib3ggPSBzY3JvbGxhYmxlQXJlYS0+c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpOwor ICAgICAgICAgICAgICAgIGJveC5tb3ZlQnkob2Zmc2V0KTsKKyAgICAgICAgICAgICAgICBub25G YXN0U2Nyb2xsYWJsZVJlZ2lvbi51bml0ZShib3gpOwogICAgICAgICAgICAgfQogICAgICAgICB9 CiAK 141526 2012-05-11 16:36:45 -0700 2012-05-11 18:13:57 -0700 Patch rdar11338017.patch text/plain 5591 jeffrey+webkit ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5OTE5MzBkLi5hMzEzOWE5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTItMDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OIChyMTE0MTcwKTogU2Nyb2xsIGFyZWFzIGluIG5lc3RlZCBmcmFtZXMgaW1wcm9w ZXJseSBwbGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5nIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjM5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNYW51YWxUZXN0cy9yZXNvdXJjZXMv ZnJhbWUtdGV4dGFyZWEuaHRtbDogQWRkZWQuCisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xs YWJsZS1wb3NpdGlvbmVkLWZyYW1lLmh0bWw6IEFkZGVkLgorICAgICAgICAqIE1hbnVhbFRlc3Rz L3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUuaHRtbDogQWRkZWQuCisKIDIwMTIt MDUtMTEgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAg TWVkaWFTdHJlYW0gQVBJOiBGaXggYSByZWZlcmVuY2UgY291bnRpbmcgaXNzdWUgaW4gVXNlck1l ZGlhUmVxdWVzdApkaWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvcmVzb3VyY2VzL2ZyYW1lLXRleHRh cmVhLmh0bWwgYi9NYW51YWxUZXN0cy9yZXNvdXJjZXMvZnJhbWUtdGV4dGFyZWEuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41NGEzZTA5Ci0tLSAvZGV2L251bGwKKysr IGIvTWFudWFsVGVzdHMvcmVzb3VyY2VzL2ZyYW1lLXRleHRhcmVhLmh0bWwKQEAgLTAsMCArMSw5 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+CisgIDx0ZXh0YXJlYT5Mb3JlbSBp cHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBQZWxsZW50 ZXNxdWUgbnVsbGEgZXN0LCB0aW5jaWR1bnQgcGhhcmV0cmEgaGVuZHJlcml0IG5lYywgdWx0cmlj ZXMgbm9uIG1pLiBGdXNjZSBmZXVnaWF0IHRlbXB1cyBtb2xsaXMuIE51bGxhIHNhcGllbiBhdWd1 ZSwgaWFjdWxpcyBzaXQgYW1ldCBvcm5hcmUgdml0YWUsIHVsdHJpY2llcyBub24gYW50ZS4gQWxp cXVhbSBkaWduaXNzaW0gcG9ydGEgZG9sb3IsIGFjIGxhb3JlZXQgbGVjdHVzIGZhdWNpYnVzIGFj LiBQaGFzZWxsdXMgbHVjdHVzIGVyb3MgaW4gZXJhdCBmZXJtZW50dW0gcmhvbmN1cy4gQ3VtIHNv Y2lpcyBuYXRvcXVlIHBlbmF0aWJ1cyBldCBtYWduaXMgZGlzIHBhcnR1cmllbnQgbW9udGVzLCBu YXNjZXR1ciByaWRpY3VsdXMgbXVzLiBEb25lYyB2ZW5lbmF0aXMgYmliZW5kdW0gcXVhbS4KKwor Q3JhcyB2ZWwgdGVsbHVzIHRlbGx1cywgYWNjdW1zYW4gbWFsZXN1YWRhIGVyYXQuIE1hdXJpcyB0 aW5jaWR1bnQgZmVybWVudHVtIG1hc3NhIHNpdCBhbWV0IG9ybmFyZS4gU2VkIHBlbGxlbnRlc3F1 ZSB1bHRyaWNlcyBzYXBpZW4sIG5vbiBjdXJzdXMgZmVsaXMgdmVzdGlidWx1bSBpZC4gSW50ZWdl ciB2aXRhZSBlbmltIG5lYyBsYWN1cyBoZW5kcmVyaXQgY29uc2VxdWF0IGlkIGluIHB1cnVzLiBT dXNwZW5kaXNzZSBwb3J0YSwgZW5pbSBuZWMgY29uZ3VlIGF1Y3RvciwgbmlzaSBhdWd1ZSB2dWxw dXRhdGUgbWFnbmEsIGV1IHNvbGxpY2l0dWRpbiBlbGl0IGZlbGlzIGlkIGVyYXQuIEN1cmFiaXR1 ciBpbiBhbnRlIGVsaXQsIGV0IGxvYm9ydGlzIG51bGxhLiBMb3JlbSBpcHN1bSBkb2xvciBzaXQg YW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBBZW5lYW4gZ3JhdmlkYSBvZGlvIG5v biBudWxsYSBwb3J0YSBjb252YWxsaXMuCisgIDwvdGV4dGFyZWE+Cis8L2JvZHk+Cis8L2h0bWw+ ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvc2Ny b2xsYWJsZS1wb3NpdGlvbmVkLWZyYW1lLmh0bWwgYi9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBv c2l0aW9uZWQtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41 NmY4MGYzCi0tLSAvZGV2L251bGwKKysrIGIvTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlv bmVkLWZyYW1lLmh0bWwKQEAgLTAsMCArMSw3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGJvZHk+CisgIDxwPlRoZSBjb250ZW50cyBvZiB0aGlzIGZyYW1lIHNob3VsZCBzY3JvbGwgd2l0 aCB0aGUgbW91c2Ugd2hlZWwuPC9wPgorICA8aWZyYW1lIHdpZHRoPTIwMCBzY3JvbGxpbmc9eWVz IHNyYz0icmVzb3VyY2VzL2ZyYW1lLXRleHRhcmVhLmh0bWwiIHN0eWxlPSJwb3NpdGlvbjpmaXhl ZDsgbGVmdDogMjAwcHgiIGlkPSJmcmFtZSI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtbmVzdGVkLWZyYW1l Lmh0bWwgYi9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtbmVzdGVkLWZyYW1lLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGU1M2JiYgotLS0gL2Rldi9u dWxsCisrKyBiL01hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUu aHRtbApAQCAtMCwwICsxLDcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKyAg PHA+VGhlIGNvbnRlbnRzIG9mIHRoaXMgZnJhbWUgc2hvdWxkIHNjcm9sbCB3aXRoIHRoZSBtb3Vz ZSB3aGVlbC48L3A+CisgIDxpZnJhbWUgd2lkdGg9NDAwIHNjcm9sbGluZz15ZXMgc3JjPSJzY3Jv bGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRtbCIgc3R5bGU9InBvc2l0aW9uOmZpeGVkOyBsZWZ0 OiAyMDBweCIgaWQ9ImZyYW1lIj48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA3YWYzNTc4Li45ZGYxZjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTIt MDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OIChyMTE0MTcwKTogU2Nyb2xsIGFyZWFzIGluIG5lc3RlZCBmcmFtZXMgaW1wcm9wZXJseSBw bGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5nIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZXMgYSByZWdyZXNzaW9uIGludHJvZHVjZWQg aW4gcjExNDE3MCBieSBpdGVyYXRpdmVseSBhZGRpbmcgcG9zaXRpb25zIG9mIHBhcmVudCBmcmFt ZXMgdG8gcGxhY2VtZW50IG9mIG5lc3RlZCBmcmFtZSBzY3JvbGwgYXJlYXMuCisKKyAgICAgICAg TWFudWFsIHRlc3RzOiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRt bAorICAgICAgICAgICAgICAgICAgICAgIE1hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25l ZC1uZXN0ZWQtZnJhbWUuaHRtbAorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZU5vbkZhc3RTY3JvbGxh YmxlUmVnaW9uKToKKwogMjAxMi0wNS0xMSAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBh ZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFkZXJzXSBNYWtlIENTUyBTaGFkZXJzIHJlbmRl ciB0byB0ZXh0dXJlIGZyYW1lYnVmZmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDljZjk2MTUuLjY0YmQy NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nv b3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdDb29yZGluYXRvci5jcHAKQEAgLTI5LDExICsyOSwxMyBAQAogCiAjaW5jbHVkZSAiRnJhbWUu aCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1l bnQuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUg IlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgiCiAjaW5j bHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSAiUmVuZGVyUGFydC5oIgogI2luY2x1ZGUgIlJlbmRl clZpZXcuaCIKICNpbmNsdWRlICJTY3JvbGxBbmltYXRvci5oIgogI2luY2x1ZGUgIlNjcm9sbGlu Z1RyZWVTdGF0ZS5oIgpAQCAtMTE1LDkgKzExNywxOCBAQCBzdGF0aWMgUmVnaW9uIGNvbXB1dGVO b25GYXN0U2Nyb2xsYWJsZVJlZ2lvbihGcmFtZSogbWFpbkZyYW1lKQogICAgICAgICAgICAgY29u dGludWU7CiAKICAgICAgICAgaWYgKGNvbnN0IEZyYW1lVmlldzo6U2Nyb2xsYWJsZUFyZWFTZXQq IHNjcm9sbGFibGVBcmVhcyA9IGZyYW1lVmlldy0+c2Nyb2xsYWJsZUFyZWFzKCkpIHsKKyAgICAg ICAgICAgIEludFBvaW50IG9mZnNldDsKKyAgICAgICAgICAgIEhUTUxGcmFtZU93bmVyRWxlbWVu dCogb3duZXIgPSBmcmFtZS0+b3duZXJFbGVtZW50KCk7CisgICAgICAgICAgICBmb3IgKEZyYW1l KiBuZXN0ZWRGcmFtZSA9IGZyYW1lOyBvd25lcjsgbmVzdGVkRnJhbWUgPSBvd25lci0+ZG9jdW1l bnQoKS0+ZnJhbWUoKSwgb3duZXIgPSBuZXN0ZWRGcmFtZS0+b3duZXJFbGVtZW50KCkpIHsKKyAg ICAgICAgICAgICAgICBpZiAob3duZXItPnJlbmRlclBhcnQoKSkKKyAgICAgICAgICAgICAgICAg ICAgb2Zmc2V0Lm1vdmVCeShvd25lci0+cmVuZGVyUGFydCgpLT53aWRnZXQoKS0+ZnJhbWVSZWN0 KCkubG9jYXRpb24oKSk7CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGZvciAoRnJhbWVW aWV3OjpTY3JvbGxhYmxlQXJlYVNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBzY3JvbGxhYmxlQXJl YXMtPmJlZ2luKCksIGVuZCA9IHNjcm9sbGFibGVBcmVhcy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytp dCkgewogICAgICAgICAgICAgICAgIFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9ICpp dDsKLSAgICAgICAgICAgICAgICBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbi51bml0ZShzY3JvbGxh YmxlQXJlYS0+c2Nyb2xsYWJsZUFyZWFCb3VuZGluZ0JveCgpKTsKKyAgICAgICAgICAgICAgICBJ bnRSZWN0IGJveCA9IHNjcm9sbGFibGVBcmVhLT5zY3JvbGxhYmxlQXJlYUJvdW5kaW5nQm94KCk7 CisgICAgICAgICAgICAgICAgYm94Lm1vdmVCeShvZmZzZXQpOworICAgICAgICAgICAgICAgIG5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uLnVuaXRlKGJveCk7CiAgICAgICAgICAgICB9CiAgICAgICAg IH0KIAo= 141539 2012-05-11 18:13:57 -0700 2012-05-11 18:20:57 -0700 Patch rdar11338017.patch text/plain 7419 jeffrey+webkit ZGlmZiAtLWdpdCBhL0NoYW5nZUxvZyBiL0NoYW5nZUxvZwppbmRleCA5OTE5MzBkLi5hMzEzOWE5 IDEwMDY0NAotLS0gYS9DaGFuZ2VMb2cKKysrIGIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTItMDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OIChyMTE0MTcwKTogU2Nyb2xsIGFyZWFzIGluIG5lc3RlZCBmcmFtZXMgaW1wcm9w ZXJseSBwbGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5nIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjM5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNYW51YWxUZXN0cy9yZXNvdXJjZXMv ZnJhbWUtdGV4dGFyZWEuaHRtbDogQWRkZWQuCisgICAgICAgICogTWFudWFsVGVzdHMvc2Nyb2xs YWJsZS1wb3NpdGlvbmVkLWZyYW1lLmh0bWw6IEFkZGVkLgorICAgICAgICAqIE1hbnVhbFRlc3Rz L3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUuaHRtbDogQWRkZWQuCisKIDIwMTIt MDUtMTEgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+CiAKICAgICAgICAg TWVkaWFTdHJlYW0gQVBJOiBGaXggYSByZWZlcmVuY2UgY291bnRpbmcgaXNzdWUgaW4gVXNlck1l ZGlhUmVxdWVzdApkaWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvcmVzb3VyY2VzL2ZyYW1lLXRleHRh cmVhLmh0bWwgYi9NYW51YWxUZXN0cy9yZXNvdXJjZXMvZnJhbWUtdGV4dGFyZWEuaHRtbApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41NGEzZTA5Ci0tLSAvZGV2L251bGwKKysr IGIvTWFudWFsVGVzdHMvcmVzb3VyY2VzL2ZyYW1lLXRleHRhcmVhLmh0bWwKQEAgLTAsMCArMSw5 IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+CisgIDx0ZXh0YXJlYT5Mb3JlbSBp cHN1bSBkb2xvciBzaXQgYW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBQZWxsZW50 ZXNxdWUgbnVsbGEgZXN0LCB0aW5jaWR1bnQgcGhhcmV0cmEgaGVuZHJlcml0IG5lYywgdWx0cmlj ZXMgbm9uIG1pLiBGdXNjZSBmZXVnaWF0IHRlbXB1cyBtb2xsaXMuIE51bGxhIHNhcGllbiBhdWd1 ZSwgaWFjdWxpcyBzaXQgYW1ldCBvcm5hcmUgdml0YWUsIHVsdHJpY2llcyBub24gYW50ZS4gQWxp cXVhbSBkaWduaXNzaW0gcG9ydGEgZG9sb3IsIGFjIGxhb3JlZXQgbGVjdHVzIGZhdWNpYnVzIGFj LiBQaGFzZWxsdXMgbHVjdHVzIGVyb3MgaW4gZXJhdCBmZXJtZW50dW0gcmhvbmN1cy4gQ3VtIHNv Y2lpcyBuYXRvcXVlIHBlbmF0aWJ1cyBldCBtYWduaXMgZGlzIHBhcnR1cmllbnQgbW9udGVzLCBu YXNjZXR1ciByaWRpY3VsdXMgbXVzLiBEb25lYyB2ZW5lbmF0aXMgYmliZW5kdW0gcXVhbS4KKwor Q3JhcyB2ZWwgdGVsbHVzIHRlbGx1cywgYWNjdW1zYW4gbWFsZXN1YWRhIGVyYXQuIE1hdXJpcyB0 aW5jaWR1bnQgZmVybWVudHVtIG1hc3NhIHNpdCBhbWV0IG9ybmFyZS4gU2VkIHBlbGxlbnRlc3F1 ZSB1bHRyaWNlcyBzYXBpZW4sIG5vbiBjdXJzdXMgZmVsaXMgdmVzdGlidWx1bSBpZC4gSW50ZWdl ciB2aXRhZSBlbmltIG5lYyBsYWN1cyBoZW5kcmVyaXQgY29uc2VxdWF0IGlkIGluIHB1cnVzLiBT dXNwZW5kaXNzZSBwb3J0YSwgZW5pbSBuZWMgY29uZ3VlIGF1Y3RvciwgbmlzaSBhdWd1ZSB2dWxw dXRhdGUgbWFnbmEsIGV1IHNvbGxpY2l0dWRpbiBlbGl0IGZlbGlzIGlkIGVyYXQuIEN1cmFiaXR1 ciBpbiBhbnRlIGVsaXQsIGV0IGxvYm9ydGlzIG51bGxhLiBMb3JlbSBpcHN1bSBkb2xvciBzaXQg YW1ldCwgY29uc2VjdGV0dXIgYWRpcGlzY2luZyBlbGl0LiBBZW5lYW4gZ3JhdmlkYSBvZGlvIG5v biBudWxsYSBwb3J0YSBjb252YWxsaXMuCisgIDwvdGV4dGFyZWE+Cis8L2JvZHk+Cis8L2h0bWw+ ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQpkaWZmIC0tZ2l0IGEvTWFudWFsVGVzdHMvc2Ny b2xsYWJsZS1wb3NpdGlvbmVkLWZyYW1lLmh0bWwgYi9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBv c2l0aW9uZWQtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi41 NmY4MGYzCi0tLSAvZGV2L251bGwKKysrIGIvTWFudWFsVGVzdHMvc2Nyb2xsYWJsZS1wb3NpdGlv bmVkLWZyYW1lLmh0bWwKQEAgLTAsMCArMSw3IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgor PGJvZHk+CisgIDxwPlRoZSBjb250ZW50cyBvZiB0aGlzIGZyYW1lIHNob3VsZCBzY3JvbGwgd2l0 aCB0aGUgbW91c2Ugd2hlZWwuPC9wPgorICA8aWZyYW1lIHdpZHRoPTIwMCBzY3JvbGxpbmc9eWVz IHNyYz0icmVzb3VyY2VzL2ZyYW1lLXRleHRhcmVhLmh0bWwiIHN0eWxlPSJwb3NpdGlvbjpmaXhl ZDsgbGVmdDogMjAwcHgiIGlkPSJmcmFtZSI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtbmVzdGVkLWZyYW1l Lmh0bWwgYi9NYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtbmVzdGVkLWZyYW1lLmh0 bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNGU1M2JiYgotLS0gL2Rldi9u dWxsCisrKyBiL01hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25lZC1uZXN0ZWQtZnJhbWUu aHRtbApAQCAtMCwwICsxLDcgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8Ym9keT4KKyAg PHA+VGhlIGNvbnRlbnRzIG9mIHRoaXMgZnJhbWUgc2hvdWxkIHNjcm9sbCB3aXRoIHRoZSBtb3Vz ZSB3aGVlbC48L3A+CisgIDxpZnJhbWUgd2lkdGg9NDAwIHNjcm9sbGluZz15ZXMgc3JjPSJzY3Jv bGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRtbCIgc3R5bGU9InBvc2l0aW9uOmZpeGVkOyBsZWZ0 OiAyMDBweCIgaWQ9ImZyYW1lIj48L2lmcmFtZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCA3YWYzNTc4Li5lY2M0NGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTIt MDUtMTEgIEplZmZyZXkgUGZhdSAgPGpwZmF1QGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNT SU9OIChyMTE0MTcwKTogU2Nyb2xsIGFyZWFzIGluIG5lc3RlZCBmcmFtZXMgaW1wcm9wZXJseSBw bGFjZWQgd2hlbiB0aWxlZCBkcmF3aW5nIGlzIGVuYWJsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2MjM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZXMgYSByZWdyZXNzaW9uIGludHJvZHVjZWQg aW4gcjExNDE3MCBieSByZWN1cnNpdmVseSBhZGRpbmcgcG9zaXRpb25zIG9mIHBhcmVudCBmcmFt ZXMgdG8gcGxhY2VtZW50IG9mIG5lc3RlZCBmcmFtZSBzY3JvbGwgYXJlYXMuCisKKyAgICAgICAg TWFudWFsIHRlc3RzOiBNYW51YWxUZXN0cy9zY3JvbGxhYmxlLXBvc2l0aW9uZWQtZnJhbWUuaHRt bAorICAgICAgICAgICAgICAgICAgICAgIE1hbnVhbFRlc3RzL3Njcm9sbGFibGUtcG9zaXRpb25l ZC1uZXN0ZWQtZnJhbWUuaHRtbAorCisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5n Q29vcmRpbmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZU5vbkZhc3RTY3JvbGxh YmxlUmVnaW9uKToKKwogMjAxMi0wNS0xMSAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBh ZG9iZS5jb20+CiAKICAgICAgICAgW0NTUyBTaGFkZXJzXSBNYWtlIENTUyBTaGFkZXJzIHJlbmRl ciB0byB0ZXh0dXJlIGZyYW1lYnVmZmVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCmluZGV4IDljZjk2MTUuLjY2ZmEy OTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nv b3JkaW5hdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdDb29yZGluYXRvci5jcHAKQEAgLTI5LDExICsyOSwxMyBAQAogCiAjaW5jbHVkZSAiRnJhbWUu aCIKICNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1l bnQuaCIKICNpbmNsdWRlICJJbnRSZWN0LmgiCiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUg IlBsYXRmb3JtV2hlZWxFdmVudC5oIgogI2luY2x1ZGUgIlBsdWdpblZpZXdCYXNlLmgiCiAjaW5j bHVkZSAiUmVnaW9uLmgiCisjaW5jbHVkZSAiUmVuZGVyUGFydC5oIgogI2luY2x1ZGUgIlJlbmRl clZpZXcuaCIKICNpbmNsdWRlICJTY3JvbGxBbmltYXRvci5oIgogI2luY2x1ZGUgIlNjcm9sbGlu Z1RyZWVTdGF0ZS5oIgpAQCAtMTA1LDM0ICsxMDcsNDAgQEAgYm9vbCBTY3JvbGxpbmdDb29yZGlu YXRvcjo6Y29vcmRpbmF0ZXNTY3JvbGxpbmdGb3JGcmFtZVZpZXcoRnJhbWVWaWV3KiBmcmFtZVZp ZXcKICNlbmRpZgogfQogCi1zdGF0aWMgUmVnaW9uIGNvbXB1dGVOb25GYXN0U2Nyb2xsYWJsZVJl Z2lvbihGcmFtZSogbWFpbkZyYW1lKQorc3RhdGljIFJlZ2lvbiBjb21wdXRlTm9uRmFzdFNjcm9s bGFibGVSZWdpb24oRnJhbWUqIGZyYW1lLCBjb25zdCBJbnRQb2ludCYgcGFyZW50Q29ybmVyID0g SW50UG9pbnQoKSkKIHsKICAgICBSZWdpb24gbm9uRmFzdFNjcm9sbGFibGVSZWdpb247CisgICAg RnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZS0+dmlldygpOworICAgIGlmICghZnJhbWVWaWV3 KQorICAgICAgICByZXR1cm4gbm9uRmFzdFNjcm9sbGFibGVSZWdpb247CiAKLSAgICBmb3IgKEZy YW1lKiBmcmFtZSA9IG1haW5GcmFtZTsgZnJhbWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJh dmVyc2VOZXh0KCkpIHsKLSAgICAgICAgRnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBmcmFtZS0+dmll dygpOwotICAgICAgICBpZiAoIWZyYW1lVmlldykKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAg IEludFBvaW50IGNvcm5lciA9IHBhcmVudENvcm5lcjsKKyAgICBjb3JuZXIubW92ZUJ5KGZyYW1l Vmlldy0+ZnJhbWVSZWN0KCkubG9jYXRpb24oKSk7CiAKLSAgICAgICAgaWYgKGNvbnN0IEZyYW1l Vmlldzo6U2Nyb2xsYWJsZUFyZWFTZXQqIHNjcm9sbGFibGVBcmVhcyA9IGZyYW1lVmlldy0+c2Ny b2xsYWJsZUFyZWFzKCkpIHsKLSAgICAgICAgICAgIGZvciAoRnJhbWVWaWV3OjpTY3JvbGxhYmxl QXJlYVNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBzY3JvbGxhYmxlQXJlYXMtPmJlZ2luKCksIGVu ZCA9IHNjcm9sbGFibGVBcmVhcy0+ZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICAg ICAgICAgIFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9ICppdDsKLSAgICAgICAgICAg ICAgICBub25GYXN0U2Nyb2xsYWJsZVJlZ2lvbi51bml0ZShzY3JvbGxhYmxlQXJlYS0+c2Nyb2xs YWJsZUFyZWFCb3VuZGluZ0JveCgpKTsKLSAgICAgICAgICAgIH0KKyAgICBpZiAoY29uc3QgRnJh bWVWaWV3OjpTY3JvbGxhYmxlQXJlYVNldCogc2Nyb2xsYWJsZUFyZWFzID0gZnJhbWVWaWV3LT5z Y3JvbGxhYmxlQXJlYXMoKSkgeworICAgICAgICBmb3IgKEZyYW1lVmlldzo6U2Nyb2xsYWJsZUFy ZWFTZXQ6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gc2Nyb2xsYWJsZUFyZWFzLT5iZWdpbigpLCBlbmQg PSBzY3JvbGxhYmxlQXJlYXMtPmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgICAg IFNjcm9sbGFibGVBcmVhKiBzY3JvbGxhYmxlQXJlYSA9ICppdDsKKyAgICAgICAgICAgIEludFJl Y3QgYm94ID0gc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbGFibGVBcmVhQm91bmRpbmdCb3goKTsKKyAg ICAgICAgICAgIGJveC5tb3ZlQnkoY29ybmVyKTsKKyAgICAgICAgICAgIG5vbkZhc3RTY3JvbGxh YmxlUmVnaW9uLnVuaXRlKGJveCk7CiAgICAgICAgIH0KKyAgICB9CiAKLSAgICAgICAgaWYgKGNv bnN0IEhhc2hTZXQ8UmVmUHRyPFdpZGdldD4gPiogY2hpbGRyZW4gPSBmcmFtZVZpZXctPmNoaWxk cmVuKCkpIHsKLSAgICAgICAgICAgIGZvciAoSGFzaFNldDxSZWZQdHI8V2lkZ2V0PiA+Ojpjb25z dF9pdGVyYXRvciBpdCA9IGNoaWxkcmVuLT5iZWdpbigpLCBlbmQgPSBjaGlsZHJlbi0+ZW5kKCk7 IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICAgICAgICAgIGlmICghKCppdCktPmlzUGx1Z2lu Vmlld0Jhc2UoKSkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAg ICAgCi0gICAgICAgICAgICAgICAgUGx1Z2luVmlld0Jhc2UqIHBsdWdpblZpZXdCYXNlID0gc3Rh dGljX2Nhc3Q8UGx1Z2luVmlld0Jhc2UqPigoKml0KS5nZXQoKSk7Ci0gICAgICAgICAgICAgICAg aWYgKHBsdWdpblZpZXdCYXNlLT53YW50c1doZWVsRXZlbnRzKCkpCi0gICAgICAgICAgICAgICAg ICAgIG5vbkZhc3RTY3JvbGxhYmxlUmVnaW9uLnVuaXRlKHBsdWdpblZpZXdCYXNlLT5mcmFtZVJl Y3QoKSk7Ci0gICAgICAgICAgICB9CisgICAgaWYgKGNvbnN0IEhhc2hTZXQ8UmVmUHRyPFdpZGdl dD4gPiogY2hpbGRyZW4gPSBmcmFtZVZpZXctPmNoaWxkcmVuKCkpIHsKKyAgICAgICAgZm9yIChI YXNoU2V0PFJlZlB0cjxXaWRnZXQ+ID46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gY2hpbGRyZW4tPmJl Z2luKCksIGVuZCA9IGNoaWxkcmVuLT5lbmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAg ICAgICBpZiAoISgqaXQpLT5pc1BsdWdpblZpZXdCYXNlKCkpCisgICAgICAgICAgICAgICAgY29u dGludWU7CisKKyAgICAgICAgICAgIFBsdWdpblZpZXdCYXNlKiBwbHVnaW5WaWV3QmFzZSA9IHN0 YXRpY19jYXN0PFBsdWdpblZpZXdCYXNlKj4oKCppdCkuZ2V0KCkpOworICAgICAgICAgICAgaWYg KHBsdWdpblZpZXdCYXNlLT53YW50c1doZWVsRXZlbnRzKCkpCisgICAgICAgICAgICAgICAgbm9u RmFzdFNjcm9sbGFibGVSZWdpb24udW5pdGUocGx1Z2luVmlld0Jhc2UtPmZyYW1lUmVjdCgpKTsK ICAgICAgICAgfQogICAgIH0KIAorICAgIEZyYW1lVHJlZSogdHJlZSA9IGZyYW1lLT50cmVlKCk7 CisgICAgZm9yIChGcmFtZSogc3ViRnJhbWUgPSB0cmVlLT5maXJzdENoaWxkKCk7IHN1YkZyYW1l OyBzdWJGcmFtZSA9IHN1YkZyYW1lLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCisgICAgICAgIG5v bkZhc3RTY3JvbGxhYmxlUmVnaW9uLnVuaXRlKGNvbXB1dGVOb25GYXN0U2Nyb2xsYWJsZVJlZ2lv bihzdWJGcmFtZSwgY29ybmVyKSk7CisKICAgICByZXR1cm4gbm9uRmFzdFNjcm9sbGFibGVSZWdp b247CiB9CiAK