83406 2012-04-06 15:50:17 -0700 Rename paintingGoesToWindow() to paintsIntoWindow() 2012-04-06 15:55:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 597760 0 simon.fraser 2012-04-06 15:50:17 -0700 Rename paintingGoesToWindow() to paintsIntoWindow() 597766 1 136082 simon.fraser 2012-04-06 15:52:10 -0700 Created attachment 136082 Patch 597769 2 136082 krit 2012-04-06 15:53:46 -0700 Comment on attachment 136082 Patch r=me 597770 3 simon.fraser 2012-04-06 15:55:59 -0700 http://trac.webkit.org/changeset/113514 136082 2012-04-06 15:52:10 -0700 2012-04-06 15:53:46 -0700 Patch bug-83406-20120406155209.patch text/plain 9213 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNDk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRlZGMyY2M5N2ZjNzMy MzIyMTFhZWRlYjQyMDAyOTg5YzExYzEyZi4uZmYyMDk3MDAxNTAzNDFhODZiZGE1OGU3NmZjYWVh YjA3ZjBiZThlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA0LTA2ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbmFtZSBwYWlu dGluZ0dvZXNUb1dpbmRvdygpIHRvIHBhaW50c0ludG9XaW5kb3coKQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM0MDYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFJlbmFtZSBwYWludGluZ0dv ZXNUb1dpbmRvdygpIHRvIHBhaW50c0ludG9XaW5kb3coKSB0byBiZSBjb25zaXN0ZW50CisgICAg ICAgIHdpdGggc29tZSBmdXR1cmUgcmVmYWN0b3JpbmcuCisKKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldEZpbHRl ckJhY2tlbmROZWVkc1JlcGFpbnRpbmdJblJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnBhaW50TGF5ZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnBhaW50 c1dpdGhUcmFuc2Zvcm0pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldEJhY2tp bmdOZWVkc1JlcGFpbnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldEJhY2tp bmdOZWVkc1JlcGFpbnRJblJlY3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckJh Y2tpbmcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJCYWNraW5nOjpjb250YWlu c1BhaW50ZWRDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6 cGFpbnRzSW50b1dpbmRvdyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckJhY2tpbmc6 OnBhaW50SW50b0xheWVyKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5n Lmg6CisgICAgICAgIChSZW5kZXJMYXllckJhY2tpbmcpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJD b21wb3NpdG9yOjpyb290TGF5ZXJBdHRhY2htZW50Q2hhbmdlZCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnJl cGFpbnRVc2luZ0NvbnRhaW5lcik6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVmlldzo6cGFpbnRCb3hEZWNvcmF0aW9ucyk6CisK IDIwMTItMDQtMDYgIEFiaGlzaGVrIEFyeWEgIDxpbmZlcm5vQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBWaXJ0dWFsaXplIGNyZWF0ZUFub255bW91c0JveFdpdGhTYW1lVHlwZUFzLgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKaW5kZXggYTcwZmNjNWY3MjFjN2ZhOTc5 NmE0ZTNhZDY3MTJiZmRkMzEwYjlmOC4uN2M4YTZkNzBlMTFjOTljYmFkMzZhZjZiMGM1M2JjOTAz NmRjNmRlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC0x MDEwLDcgKzEwMTAsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzZXRGaWx0ZXJCYWNrZW5kTmVlZHNS ZXBhaW50aW5nSW5SZWN0KGNvbnN0IExheW91dFJlY3QmIHJlY3QsCiAgICAgCiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgIGlmIChwYXJlbnRMYXllci0+aXNDb21wb3NpdGVk KCkpIHsKLSAgICAgICAgaWYgKCFwYXJlbnRMYXllci0+YmFja2luZygpLT5wYWludGluZ0dvZXNU b1dpbmRvdygpKSB7CisgICAgICAgIGlmICghcGFyZW50TGF5ZXItPmJhY2tpbmcoKS0+cGFpbnRz SW50b1dpbmRvdygpKSB7CiAgICAgICAgICAgICBwYXJlbnRMYXllci0+c2V0QmFja2luZ05lZWRz UmVwYWludEluUmVjdChwYXJlbnRMYXllclJlY3QpOwogICAgICAgICAgICAgcmV0dXJuOwogICAg ICAgICB9CkBAIC0yODU1LDcgKzI4NTUsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpwYWludExheWVy KFJlbmRlckxheWVyKiByb290TGF5ZXIsIEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwKICAgICAg ICAgLy8gYnV0IHdlIG5lZWQgdG8gZW5zdXJlIHRoYXQgd2UgZG9uJ3QgY2FjaGUgY2xpcCByZWN0 cyBjb21wdXRlZCB3aXRoIHRoZSB3cm9uZyByb290IGluIHRoaXMgY2FzZS4KICAgICAgICAgaWYg KGNvbnRleHQtPnVwZGF0aW5nQ29udHJvbFRpbnRzKCkgfHwgKHBhaW50QmVoYXZpb3IgJiBQYWlu dEJlaGF2aW9yRmxhdHRlbkNvbXBvc2l0aW5nTGF5ZXJzKSkKICAgICAgICAgICAgIHBhaW50Rmxh Z3MgfD0gUGFpbnRMYXllclRlbXBvcmFyeUNsaXBSZWN0czsKLSAgICAgICAgZWxzZSBpZiAoIWJh Y2tpbmcoKS0+cGFpbnRpbmdHb2VzVG9XaW5kb3coKSAmJiAhc2hvdWxkRG9Tb2Z0d2FyZVBhaW50 KHRoaXMsIHBhaW50RmxhZ3MgJiBQYWludExheWVyUGFpbnRpbmdSZWZsZWN0aW9uKSkgeworICAg ICAgICBlbHNlIGlmICghYmFja2luZygpLT5wYWludHNJbnRvV2luZG93KCkgJiYgIXNob3VsZERv U29mdHdhcmVQYWludCh0aGlzLCBwYWludEZsYWdzICYgUGFpbnRMYXllclBhaW50aW5nUmVmbGVj dGlvbikpIHsKICAgICAgICAgICAgIC8vIElmIHRoaXMgUmVuZGVyTGF5ZXIgc2hvdWxkIHBhaW50 IGludG8gaXRzIGJhY2tpbmcsIHRoYXQgd2lsbCBiZSBkb25lIHZpYSBSZW5kZXJMYXllckJhY2tp bmc6OnBhaW50SW50b0xheWVyKCkuCiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAg LTQyNzAsNyArNDI3MCw3IEBAIEdyYXBoaWNzTGF5ZXIqIFJlbmRlckxheWVyOjpsYXllckZvclNj cm9sbENvcm5lcigpIGNvbnN0CiBib29sIFJlbmRlckxheWVyOjpwYWludHNXaXRoVHJhbnNmb3Jt KFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlvcikgY29uc3QKIHsKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCi0gICAgYm9vbCBwYWludHNUb1dpbmRvdyA9ICFpc0NvbXBvc2l0ZWQo KSB8fCBiYWNraW5nKCktPnBhaW50aW5nR29lc1RvV2luZG93KCk7CisgICAgYm9vbCBwYWludHNU b1dpbmRvdyA9ICFpc0NvbXBvc2l0ZWQoKSB8fCBiYWNraW5nKCktPnBhaW50c0ludG9XaW5kb3co KTsKICNlbHNlCiAgICAgYm9vbCBwYWludHNUb1dpbmRvdyA9IHRydWU7CiAjZW5kaWYgICAgCkBA IC00NTUwLDcgKzQ1NTAsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpyZXBhaW50SW5jbHVkaW5nRGVz Y2VuZGFudHMoKQogdm9pZCBSZW5kZXJMYXllcjo6c2V0QmFja2luZ05lZWRzUmVwYWludCgpCiB7 CiAgICAgQVNTRVJUKGlzQ29tcG9zaXRlZCgpKTsKLSAgICBpZiAoYmFja2luZygpLT5wYWludGlu Z0dvZXNUb1dpbmRvdygpKSB7CisgICAgaWYgKGJhY2tpbmcoKS0+cGFpbnRzSW50b1dpbmRvdygp KSB7CiAgICAgICAgIC8vIElmIHdlJ3JlIHRyeWluZyB0byByZXBhaW50IHRoZSBwbGFjZWhvbGRl ciBkb2N1bWVudCBsYXllciwgcHJvcGFnYXRlIHRoZQogICAgICAgICAvLyByZXBhaW50IHRvIHRo ZSBuYXRpdmUgdmlldyBzeXN0ZW0uCiAgICAgICAgIFJlbmRlclZpZXcqIHZpZXcgPSByZW5kZXJl cigpLT52aWV3KCk7CkBAIC00NTY1LDcgKzQ1NjUsNyBAQCB2b2lkIFJlbmRlckxheWVyOjpzZXRC YWNraW5nTmVlZHNSZXBhaW50SW5SZWN0KGNvbnN0IExheW91dFJlY3QmIHIpCiAgICAgLy8gaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYxMTU5IGRlc2NyaWJlcyBhbiB1 bnJlcHJvZHVjaWJsZSBjcmFzaCBoZXJlLAogICAgIC8vIHNvIGFzc2VydCBidXQgY2hlY2sgdGhh dCB0aGUgbGF5ZXIgaXMgY29tcG9zaXRlZC4KICAgICBBU1NFUlQoaXNDb21wb3NpdGVkKCkpOwot ICAgIGlmICghaXNDb21wb3NpdGVkKCkgfHwgYmFja2luZygpLT5wYWludGluZ0dvZXNUb1dpbmRv dygpKSB7CisgICAgaWYgKCFpc0NvbXBvc2l0ZWQoKSB8fCBiYWNraW5nKCktPnBhaW50c0ludG9X aW5kb3coKSkgewogICAgICAgICAvLyBJZiB3ZSdyZSB0cnlpbmcgdG8gcmVwYWludCB0aGUgcGxh Y2Vob2xkZXIgZG9jdW1lbnQgbGF5ZXIsIHByb3BhZ2F0ZSB0aGUKICAgICAgICAgLy8gcmVwYWlu dCB0byB0aGUgbmF0aXZlIHZpZXcgc3lzdGVtLgogICAgICAgICBMYXlvdXRSZWN0IGFic1JlY3Qo cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNr aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3Bw CmluZGV4IGE5MTMwMzIyMzE5NWQwYzg4ODNhZjgyMTZhMzFiNmY2MWNkYWZmZjUuLjhjNzlmZDNk ODZmZTYwNWE4YTI1M2FlMTA1NzU3YzMwYzQ2NWFkNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC05MzcsNyArOTM3LDcgQEAgYm9v bCBSZW5kZXJMYXllckJhY2tpbmc6Omhhc1Zpc2libGVOb25Db21wb3NpdGluZ0Rlc2NlbmRhbnRM YXllcnMoKSBjb25zdAogCiBib29sIFJlbmRlckxheWVyQmFja2luZzo6Y29udGFpbnNQYWludGVk Q29udGVudCgpIGNvbnN0CiB7Ci0gICAgaWYgKGlzU2ltcGxlQ29udGFpbmVyQ29tcG9zaXRpbmdM YXllcigpIHx8IHBhaW50aW5nR29lc1RvV2luZG93KCkgfHwgbV9hcnRpZmljaWFsbHlJbmZsYXRl ZEJvdW5kcyB8fCBtX293bmluZ0xheWVyLT5pc1JlZmxlY3Rpb24oKSkKKyAgICBpZiAoaXNTaW1w bGVDb250YWluZXJDb21wb3NpdGluZ0xheWVyKCkgfHwgcGFpbnRzSW50b1dpbmRvdygpIHx8IG1f YXJ0aWZpY2lhbGx5SW5mbGF0ZWRCb3VuZHMgfHwgbV9vd25pbmdMYXllci0+aXNSZWZsZWN0aW9u KCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIGlmIChpc0RpcmVjdGx5Q29tcG9zaXRl ZEltYWdlKCkpCkBAIC0xMDc2LDcgKzEwNzYsNyBAQCBJbnRSZWN0IFJlbmRlckxheWVyQmFja2lu Zzo6Y29udGVudHNCb3goKSBjb25zdAogICAgIHJldHVybiBjb250ZW50c1JlY3Q7CiB9CiAKLWJv b2wgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludGluZ0dvZXNUb1dpbmRvdygpIGNvbnN0Citib29s IFJlbmRlckxheWVyQmFja2luZzo6cGFpbnRzSW50b1dpbmRvdygpIGNvbnN0CiB7CiAgICAgaWYg KG1fdXNpbmdUaWxlZENhY2hlTGF5ZXIpCiAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTExMzIs NyArMTEzMiw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJCYWNraW5nOjpwYWludEludG9MYXllcihSZW5k ZXJMYXllciogcm9vdExheWVyLCBHcmFwaGljc0NvbnRleHQqCiAgICAgICAgICAgICAgICAgICAg IFBhaW50QmVoYXZpb3IgcGFpbnRCZWhhdmlvciwgR3JhcGhpY3NMYXllclBhaW50aW5nUGhhc2Ug cGFpbnRpbmdQaGFzZSwKICAgICAgICAgICAgICAgICAgICAgUmVuZGVyT2JqZWN0KiBwYWludGlu Z1Jvb3QpCiB7Ci0gICAgaWYgKHBhaW50aW5nR29lc1RvV2luZG93KCkpIHsKKyAgICBpZiAocGFp bnRzSW50b1dpbmRvdygpKSB7CiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyQmFja2luZy5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVy QmFja2luZy5oCmluZGV4IDkzZDNiNTIxZGNjYmNiZTIwYjg2MDgyMjI2M2U5OTZhODM3Y2VlYzQu LjQyNDRkY2E5YTAyNjM0MmUxMDkwNjc4NTRiNjEwNWU5MzQ3NTVlZDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmgKQEAgLTk1LDcgKzk1LDcgQEAg cHVibGljOgogICAgIC8vIGZvciBkZXNjZW5kYW50cywgYnV0IGl0cyBjb250ZW50cyB1c3VhbGx5 IHJlbmRlciBpbnRvIHRoZSB3aW5kb3cgKGluIHdoaWNoIGNhc2UgdGhpcyByZXR1cm5zIHRydWUp LgogICAgIC8vIFRoaXMgcmV0dXJucyBmYWxzZSBmb3Igb3RoZXIgbGF5ZXJzLCBhbmQgd2hlbiB0 aGUgZG9jdW1lbnQgbGF5ZXIgYWN0dWFsbHkgbmVlZHMgdG8gcGFpbnQgaW50byBpdHMgYmFja2lu ZyBzdG9yZQogICAgIC8vIGZvciBzb21lIHJlYXNvbi4KLSAgICBib29sIHBhaW50aW5nR29lc1Rv V2luZG93KCkgY29uc3Q7CisgICAgYm9vbCBwYWludHNJbnRvV2luZG93KCkgY29uc3Q7CiAKICAg ICB2b2lkIHNldENvbnRlbnRzTmVlZERpc3BsYXkoKTsKICAgICAvLyByIGlzIGluIHRoZSBjb29y ZGluYXRlIHNwYWNlIG9mIHRoZSBsYXllcidzIHJlbmRlciBvYmplY3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKaW5kZXggMmQ1ZGFk MDI5ZGNiMzlhNDkwN2E0MjhmODVkODA3ZmQ5ZWM3MzVjOC4uZmI0N2RhNDI1MjY3ZjI3YzZiZjU4 OTkyMDFhOTFhZmZiMmJjOWIzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTIwNDIsNyArMjA0Miw3IEBAIHZvaWQgUmVu ZGVyTGF5ZXJDb21wb3NpdG9yOjp1cGRhdGVSb290TGF5ZXJBdHRhY2htZW50KCkKIAogdm9pZCBS ZW5kZXJMYXllckNvbXBvc2l0b3I6OnJvb3RMYXllckF0dGFjaG1lbnRDaGFuZ2VkKCkKIHsKLSAg ICAvLyBUaGUgYXR0YWNobWVudCBjYW4gYWZmZWN0IHdoZXRoZXIgdGhlIFJlbmRlclZpZXcgbGF5 ZXIncyBwYWludGluZ0dvZXNUb1dpbmRvdygpIGJlaGF2aW9yLAorICAgIC8vIFRoZSBhdHRhY2ht ZW50IGNhbiBhZmZlY3Qgd2hldGhlciB0aGUgUmVuZGVyVmlldyBsYXllcidzIHBhaW50c0ludG9X aW5kb3coKSBiZWhhdmlvciwKICAgICAvLyBzbyBjYWxsIHVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9t ZXRyeSgpIHRvIHVkcGF0ZSB0aGF0LgogICAgIFJlbmRlckxheWVyKiBsYXllciA9IG1fcmVuZGVy Vmlldy0+bGF5ZXIoKTsKICAgICBpZiAoUmVuZGVyTGF5ZXJCYWNraW5nKiBiYWNraW5nID0gbGF5 ZXIgPyBsYXllci0+YmFja2luZygpIDogMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAKaW5kZXggMmNiMjllYTljMGNjNjY1YzRiNDlhZWJiYjMyZTEzODczNTc5MTM4 YS4uN2EyMTRkMGM0NzY1MjJkNTllOWYwZmYwZmFhZjMxZjRkM2EwYmY1NSAxMDA3NTUKLS0tIGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKQEAgLTEzMTQsNyArMTMxNCw3IEBAIHZv aWQgUmVuZGVyT2JqZWN0OjpyZXBhaW50VXNpbmdDb250YWluZXIoUmVuZGVyQm94TW9kZWxPYmpl Y3QqIHJlcGFpbnRDb250YWluZXIsCiAgICAgaWYgKHJlcGFpbnRDb250YWluZXItPmlzUmVuZGVy VmlldygpKSB7CiAgICAgICAgIEFTU0VSVChyZXBhaW50Q29udGFpbmVyID09IHYpOwogICAgICAg ICBib29sIHZpZXdIYXNDb21wb3NpdGVkTGF5ZXIgPSB2LT5oYXNMYXllcigpICYmIHYtPmxheWVy KCktPmlzQ29tcG9zaXRlZCgpOwotICAgICAgICBpZiAoIXZpZXdIYXNDb21wb3NpdGVkTGF5ZXIg fHwgdi0+bGF5ZXIoKS0+YmFja2luZygpLT5wYWludGluZ0dvZXNUb1dpbmRvdygpKSB7CisgICAg ICAgIGlmICghdmlld0hhc0NvbXBvc2l0ZWRMYXllciB8fCB2LT5sYXllcigpLT5iYWNraW5nKCkt PnBhaW50c0ludG9XaW5kb3coKSkgewogICAgICAgICAgICAgTGF5b3V0UmVjdCByZXBhaW50UmVj dGFuZ2xlID0gcjsKICAgICAgICAgICAgIGlmICh2aWV3SGFzQ29tcG9zaXRlZExheWVyICYmICB2 LT5sYXllcigpLT50cmFuc2Zvcm0oKSkKICAgICAgICAgICAgICAgICByZXBhaW50UmVjdGFuZ2xl ID0gdi0+bGF5ZXIoKS0+dHJhbnNmb3JtKCktPm1hcFJlY3Qocik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyVmlldy5jcHAKaW5kZXggZDgzN2Q2N2VhZThlMGI5MjBhMjI2YjhmNjMyY2Fi ZmMzMGE3Yjc2ZC4uZGQ3YjY1YjRmNGFmMGQ0Y2IyMTM1ZTA0OWU0NmEzMTc3ZTQ2MTEyOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcApAQCAtMjUyLDcgKzI1Miw3IEBA IHZvaWQgUmVuZGVyVmlldzo6cGFpbnRCb3hEZWNvcmF0aW9ucyhQYWludEluZm8mIHBhaW50SW5m bywgY29uc3QgTGF5b3V0UG9pbnQmKQogCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgICAgICBpZiAoUmVuZGVyTGF5ZXIqIGNvbXBvc2l0aW5nTGF5ZXIgPSBsYXllci0+ZW5j bG9zaW5nQ29tcG9zaXRpbmdMYXllcigpKSB7Ci0gICAgICAgICAgICBpZiAoIWNvbXBvc2l0aW5n TGF5ZXItPmJhY2tpbmcoKS0+cGFpbnRpbmdHb2VzVG9XaW5kb3coKSkgeworICAgICAgICAgICAg aWYgKCFjb21wb3NpdGluZ0xheWVyLT5iYWNraW5nKCktPnBhaW50c0ludG9XaW5kb3coKSkgewog ICAgICAgICAgICAgICAgIGZyYW1lVmlldygpLT5zZXRDYW5ub3RCbGl0VG9XaW5kb3coKTsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0K