23548 2009-01-26 11:27:13 -0800 Reduce redraws when animating opacity and transform with accelerated compositing 2009-02-11 12:48:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P3 Normal --- 23359 1 simon.fraser simon.fraser hyatt oldest_to_newest 107052 0 simon.fraser 2009-01-26 11:27:13 -0800 We need to do some work in RenderStyle::diff() to avoid expensive layout while we're animating opacity or transform. 109340 1 27567 simon.fraser 2009-02-11 12:06:33 -0800 Created attachment 27567 Patch, changelog 109347 2 27567 hyatt 2009-02-11 12:35:39 -0800 Comment on attachment 27567 Patch, changelog Typo: "udpated" should be "updated" Another typo: "whehter" should be "whether" r=me 109349 3 simon.fraser 2009-02-11 12:48:30 -0800 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/rendering/RenderObject.cpp M WebCore/rendering/RenderObject.h M WebCore/rendering/style/RenderStyle.cpp M WebCore/rendering/style/RenderStyle.h M WebCore/rendering/style/RenderStyleConstants.h Committed r40863 27567 2009-02-11 12:06:33 -0800 2009-02-11 12:35:39 -0800 Patch, changelog 23548_patch.txt text/plain 11659 simon.fraser ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDM1NThmZi4uNGNjOGZlMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMCBAQAorMjAwOS0wMi0xMSAgU2ltb24gRnJhc2Vy ICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjM1NDgKKworICAgICAgICBXaGVuIG9wYWNpdHkgb3IgdHJhbnNmb3JtIGNoYW5nZSBvbiBh biBvYmplY3Qgd2hpY2ggaGFzIGEgY29tcG9zaXRpbmcgbGF5ZXIsCisgICAgICAgIGF2b2lkIHJl cGFpbnRpbmcgdGhlIGxheWVyLgorICAgICAgICAKKyAgICAgICAgQWRkZWQgYSBuZXcgU3R5bGVE aWZmZXJlbmNlIHZhbHVlLCBTdHlsZURpZmZlcmVuY2VSZWNvbXBvc2l0ZUxheWVyLCB3aGljaCBp bmRpY2F0ZXMKKyAgICAgICAgdGhhdCB0aGUgb25seSB0aGluZyBzdHlsZUNoYW5nZWQoKSBoYXMg dG8gZG8gaXMgdG8gdXBkYXRlIGNvbXBvc2l0ZWQgcHJvcGVydGllcyBvZgorICAgICAgICB0aGUg bGF5ZXIuIFJlbmRlclN0eWxlOjpkaWZmKCkgbm93IGhhcyBhbiBvdXQgcGFyYW0gZm9yIGEgYml0 bWFzayBvZiAiY29udGV4dCBzZW5zaXRpdmUiCisgICAgICAgIHByb3BlcnRpZXMsIGN1cnJlbnRs eSBmb3Igb3BhY2l0eSBhbmQgdHJhbnNmb3JtLiBXaGVuIG9uZSBvZiB0aGVzZSBjaGFuZ2VzLCB3 ZSBuZWVkCisgICAgICAgIHRvIHNlZSBpZiB3ZSBoYXZlIGEgY29tcG9zaXRpbmcgbGF5ZXIgYmVm b3JlIHdlIGRlY2lkZSB3aGV0aGVyIHRvIGxheW91dC9yZXBhaW50LAorICAgICAgICBvciBqdXN0 IHVwZGF0ZSB0aGUgY29tcG9zaXRlZCBsYXllciwgdmlhIGFkanVzdFN0eWxlRGlmZmVyZW5jZSgp LgorICAgICAgICAKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6YWRqdXN0U3R5bGVEaWZmZXJlbmNlKToKKyAgICAg ICAgKFdlYkNvcmU6OlJlbmRlck9iamVjdDo6c2V0U3R5bGUpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyT2JqZWN0OjpzdHlsZURpZENoYW5nZSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5oOgorICAgICAgICAqIHJlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJTdHlsZTo6ZGlmZik6CisgICAgICAgICogcmVuZGVyaW5n L3N0eWxlL1JlbmRlclN0eWxlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0 eWxlQ29uc3RhbnRzLmg6CisgICAgICAgIChXZWJDb3JlOjopOgorCiAyMDA5LTAyLTEwICBEYXZp ZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBTb21lIHJlbmFtZXMgb24gbGlu ZSBib3hlcy4gIHhQb3MoKS95UG9zKCkgLT4geCgpL3koKS4gIHNldFhQb3MoKS9zZXRZUG9zKCkg LT4gc2V0WCgpL3NldFkoKS4gIG1fb2JqZWN0L29iamVjdCgpIC0+IG1fcmVuZGVyZXIvcmVuZGVy ZXIoKS4gIHRleHRPYmplY3QoKSAtPiB0ZXh0UmVuZGVyZXIoKS4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJP YmplY3QuY3BwCmluZGV4IDQ2ZWI1Y2YuLmFjMDlmZmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcApAQCAtNDgsNiArNDgsMTAgQEAKICNpbmNsdWRlIDxzdGRpby5oPgogI2luY2x1ZGUg PHd0Zi9SZWZDb3VudGVkTGVha0NvdW50ZXIuaD4KIAorI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01Q T1NJVElORykKKyNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKKyNlbmRpZgorCiAj aWYgRU5BQkxFKFdNTCkKICNpbmNsdWRlICJXTUxOYW1lcy5oIgogI2VuZGlmCkBAIC0xOTc2LDE4 ICsxOTgwLDQ3IEBAIHZvaWQgUmVuZGVyT2JqZWN0OjpzZXRBbmltYXRhYmxlU3R5bGUoUGFzc1Jl ZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUpCiAgICAgICAgIHNldFN0eWxlKHN0eWxlKTsKIH0KIAor U3R5bGVEaWZmZXJlbmNlIFJlbmRlck9iamVjdDo6YWRqdXN0U3R5bGVEaWZmZXJlbmNlKFN0eWxl RGlmZmVyZW5jZSBkaWZmLCB1bnNpZ25lZCBjb250ZXh0U2Vuc2l0aXZlUHJvcGVydGllcykgY29u c3QKK3sKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgLy8gSWYgdHJhbnNm b3JtIGNoYW5nZWQsIGFuZCB3ZSBhcmUgbm90IGNvbXBvc2l0ZWQsIG5lZWQgdG8gZG8gYSBsYXlv dXQuCisgICAgaWYgKGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzICYgQ29udGV4dFNlbnNpdGl2 ZVByb3BlcnR5VHJhbnNmb3JtKQorICAgICAgICAvLyBUZXh0IG5vZGVzIHNoYXJlIHN0eWxlIHdp dGggdGhlaXIgcGFyZW50cyBidXQgdHJhbnNmb3JtcyBkb24ndCBhcHBseSB0byB0aGVtLAorICAg ICAgICAvLyBoZW5jZSB0aGUgIWlzVGV4dCgpIGNoZWNrLgorICAgICAgICBpZiAoIWlzVGV4dCgp ICYmICghaGFzTGF5ZXIoKSB8fCAhdG9SZW5kZXJCb3hNb2RlbE9iamVjdCh0aGlzKS0+bGF5ZXIo KS0+aXNDb21wb3NpdGVkKCkpKQorICAgICAgICAgICAgZGlmZiA9IFN0eWxlRGlmZmVyZW5jZUxh eW91dDsKKyAgICAgICAgZWxzZSBpZiAoZGlmZiA8IFN0eWxlRGlmZmVyZW5jZVJlY29tcG9zaXRl TGF5ZXIpCisgICAgICAgICAgICBkaWZmID0gU3R5bGVEaWZmZXJlbmNlUmVjb21wb3NpdGVMYXll cjsKKworICAgIC8vIElmIG9wYWNpdHkgY2hhbmdlZCwgYW5kIHdlIGFyZSBub3QgY29tcG9zaXRl ZCwgbmVlZCB0byByZXBhaW50IChhbHNvCisgICAgLy8gaWdub3JpbmcgdGV4dCBub2RlcykKKyAg ICBpZiAoY29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMgJiBDb250ZXh0U2Vuc2l0aXZlUHJvcGVy dHlPcGFjaXR5KQorICAgICAgICBpZiAoIWlzVGV4dCgpICYmICghaGFzTGF5ZXIoKSB8fCAhdG9S ZW5kZXJCb3hNb2RlbE9iamVjdCh0aGlzKS0+bGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkpKQorICAg ICAgICAgICAgZGlmZiA9IFN0eWxlRGlmZmVyZW5jZVJlcGFpbnRMYXllcjsKKyAgICAgICAgZWxz ZSBpZiAoZGlmZiA8IFN0eWxlRGlmZmVyZW5jZVJlY29tcG9zaXRlTGF5ZXIpCisgICAgICAgICAg ICBkaWZmID0gU3R5bGVEaWZmZXJlbmNlUmVjb21wb3NpdGVMYXllcjsKKyNlbHNlCisgICAgVU5V U0VEX1BBUkFNKGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKTsKKyNlbmRpZgorCisgICAgLy8g SWYgd2UgaGF2ZSBubyBsYXllcigpLCBqdXN0IHRyZWF0IGEgUmVwYWludExheWVyIGhpbnQgYXMg YSBub3JtYWwgUmVwYWludC4KKyAgICBpZiAoZGlmZiA9PSBTdHlsZURpZmZlcmVuY2VSZXBhaW50 TGF5ZXIgJiYgIWhhc0xheWVyKCkpCisgICAgICAgIGRpZmYgPSBTdHlsZURpZmZlcmVuY2VSZXBh aW50OworCisgICAgcmV0dXJuIGRpZmY7Cit9CisKIHZvaWQgUmVuZGVyT2JqZWN0OjpzZXRTdHls ZShQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZSkKIHsKICAgICBpZiAobV9zdHlsZSA9PSBz dHlsZSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgU3R5bGVEaWZmZXJlbmNlIGRpZmYgPSBTdHls ZURpZmZlcmVuY2VFcXVhbDsKKyAgICB1bnNpZ25lZCBjb250ZXh0U2Vuc2l0aXZlUHJvcGVydGll cyA9IENvbnRleHRTZW5zaXRpdmVQcm9wZXJ0eU5vbmU7CiAgICAgaWYgKG1fc3R5bGUpCi0gICAg ICAgIGRpZmYgPSBtX3N0eWxlLT5kaWZmKHN0eWxlLmdldCgpKTsKKyAgICAgICAgZGlmZiA9IG1f c3R5bGUtPmRpZmYoc3R5bGUuZ2V0KCksIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzKTsKIAot ICAgIC8vIElmIHdlIGhhdmUgbm8gbGF5ZXIoKSwganVzdCB0cmVhdCBhIFJlcGFpbnRMYXllciBo aW50IGFzIGEgbm9ybWFsIFJlcGFpbnQuCi0gICAgaWYgKGRpZmYgPT0gU3R5bGVEaWZmZXJlbmNl UmVwYWludExheWVyICYmICFoYXNMYXllcigpKQotICAgICAgICBkaWZmID0gU3R5bGVEaWZmZXJl bmNlUmVwYWludDsKKyAgICBkaWZmID0gYWRqdXN0U3R5bGVEaWZmZXJlbmNlKGRpZmYsIGNvbnRl eHRTZW5zaXRpdmVQcm9wZXJ0aWVzKTsKIAogICAgIHN0eWxlV2lsbENoYW5nZShkaWZmLCBzdHls ZS5nZXQoKSk7CiAgICAgCkBAIC0yMDA2LDYgKzIwMzksMjYgQEAgdm9pZCBSZW5kZXJPYmplY3Q6 OnNldFN0eWxlKFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlKQogICAgICAgICB0b1JlbmRl clZpZXcoZG9jdW1lbnQoKS0+cmVuZGVyZXIoKSktPnNldE1heGltYWxPdXRsaW5lU2l6ZShtX3N0 eWxlLT5vdXRsaW5lU2l6ZSgpKTsKIAogICAgIHN0eWxlRGlkQ2hhbmdlKGRpZmYsIG9sZFN0eWxl LmdldCgpKTsKKworICAgIGlmICghbV9wYXJlbnQgfHwgaXNUZXh0KCkpCisgICAgICAgIHJldHVy bjsKKworICAgIC8vIE5vdyB0aGF0IHRoZSBsYXllciAoaWYgYW55KSBoYXMgYmVlbiB1ZHBhdGVk LCB3ZSBuZWVkIHRvIGFkanVzdCB0aGUgZGlmZiBhZ2FpbiwKKyAgICAvLyBjaGVjayB3aGVodGVy IHdlIHNob3VsZCBsYXlvdXQgbm93LCBhbmQgZGVjaWRlIGlmIHdlIG5lZWQgdG8gcmVwYWludC4K KyAgICBTdHlsZURpZmZlcmVuY2UgdXBkYXRlZERpZmYgPSBhZGp1c3RTdHlsZURpZmZlcmVuY2Uo ZGlmZiwgY29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMpOworICAgIAorICAgIGlmIChkaWZmIDw9 IFN0eWxlRGlmZmVyZW5jZUxheW91dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHkpIHsKKyAgICAgICAg aWYgKHVwZGF0ZWREaWZmID09IFN0eWxlRGlmZmVyZW5jZUxheW91dCkKKyAgICAgICAgICAgIHNl dE5lZWRzTGF5b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOworICAgICAgICBlbHNlIGlmICh1cGRh dGVkRGlmZiA9PSBTdHlsZURpZmZlcmVuY2VMYXlvdXRQb3NpdGlvbmVkTW92ZW1lbnRPbmx5KQor ICAgICAgICAgICAgc2V0TmVlZHNQb3NpdGlvbmVkTW92ZW1lbnRMYXlvdXQoKTsKKyAgICB9Cisg ICAgCisgICAgaWYgKHVwZGF0ZWREaWZmID09IFN0eWxlRGlmZmVyZW5jZVJlcGFpbnRMYXllciB8 fCB1cGRhdGVkRGlmZiA9PSBTdHlsZURpZmZlcmVuY2VSZXBhaW50KSB7CisgICAgICAgIC8vIERv IGEgcmVwYWludCB3aXRoIHRoZSBuZXcgc3R5bGUgbm93LCBlLmcuLCBmb3IgZXhhbXBsZSBpZiB3 ZSBnbyBmcm9tCisgICAgICAgIC8vIG5vdCBoYXZpbmcgYW4gb3V0bGluZSB0byBoYXZpbmcgYW4g b3V0bGluZS4KKyAgICAgICAgcmVwYWludCgpOworICAgIH0KIH0KIAogdm9pZCBSZW5kZXJPYmpl Y3Q6OnNldFN0eWxlSW50ZXJuYWwoUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGUpCkBAIC0y MDk0LDEwICsyMTQ3LDkgQEAgdm9pZCBSZW5kZXJPYmplY3Q6OnN0eWxlRGlkQ2hhbmdlKFN0eWxl RGlmZmVyZW5jZSBkaWZmLCBjb25zdCBSZW5kZXJTdHlsZSopCiAgICAgICAgIHNldE5lZWRzTGF5 b3V0QW5kUHJlZldpZHRoc1JlY2FsYygpOwogICAgIGVsc2UgaWYgKGRpZmYgPT0gU3R5bGVEaWZm ZXJlbmNlTGF5b3V0UG9zaXRpb25lZE1vdmVtZW50T25seSkKICAgICAgICAgc2V0TmVlZHNQb3Np dGlvbmVkTW92ZW1lbnRMYXlvdXQoKTsKLSAgICBlbHNlIGlmIChkaWZmID09IFN0eWxlRGlmZmVy ZW5jZVJlcGFpbnRMYXllciB8fCBkaWZmID09IFN0eWxlRGlmZmVyZW5jZVJlcGFpbnQpCi0gICAg ICAgIC8vIERvIGEgcmVwYWludCB3aXRoIHRoZSBuZXcgc3R5bGUgbm93LCBlLmcuLCBmb3IgZXhh bXBsZSBpZiB3ZSBnbyBmcm9tCi0gICAgICAgIC8vIG5vdCBoYXZpbmcgYW4gb3V0bGluZSB0byBo YXZpbmcgYW4gb3V0bGluZS4KLSAgICAgICAgcmVwYWludCgpOworCisgICAgLy8gRG9uJ3QgY2hl Y2sgZm9yIHJlcGFpbnQgaGVyZTsgd2UgbmVlZCB0byB3YWl0IHVudGlsIHRoZSBsYXllciBoYXMg YmVlbgorICAgIC8vIHVwZGF0ZWQgYnkgc3ViY2xhc3NlcyBiZWZvcmUgd2Uga25vdyBpZiB3ZSBo YXZlIHRvIHJlcGFpbnQgKGluIHNldFN0eWxlKCkpLgogfQogCiB2b2lkIFJlbmRlck9iamVjdDo6 dXBkYXRlRmlsbEltYWdlcyhjb25zdCBGaWxsTGF5ZXIqIG9sZExheWVycywgY29uc3QgRmlsbExh eWVyKiBuZXdMYXllcnMpCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IGI5MTY4ODAuLjJk MDJkMWIgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBi L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC03OTgsNyArNzk4LDggQEAgcHJv dGVjdGVkOgogICAgIAogcHJpdmF0ZToKICAgICBSZW5kZXJTdHlsZSogZmlyc3RMaW5lU3R5bGVT bG93Q2FzZSgpIGNvbnN0OwotCisgICAgU3R5bGVEaWZmZXJlbmNlIGFkanVzdFN0eWxlRGlmZmVy ZW5jZShTdHlsZURpZmZlcmVuY2UsIHVuc2lnbmVkIGNvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVz KSBjb25zdDsKKyAgICAKICAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fc3R5bGU7CiAKICAgICBO b2RlKiBtX25vZGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJT dHlsZS5jcHAgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9SZW5kZXJTdHlsZS5jcHAKaW5kZXgg NGFkNGE2Ny4uYmRjYTczNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVu ZGVyU3R5bGUuY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlLmNw cApAQCAtMjcxLDggKzI3MSwxMCBAQCBzdGF0aWMgYm9vbCBwb3NpdGlvbmVkT2JqZWN0TW92ZWQo Y29uc3QgTGVuZ3RoQm94JiBhLCBjb25zdCBMZW5ndGhCb3gmIGIpCiAgIG9wdGltaXNhdGlvbnMg YXJlIHVuaW1wbGVtZW50ZWQsIGFuZCBjdXJyZW50bHkgcmVzdWx0IGluIHRoZQogICB3b3JzdCBj YXNlIHJlc3VsdCBjYXVzaW5nIGEgcmVsYXlvdXQgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2suCiAq LwotU3R5bGVEaWZmZXJlbmNlIFJlbmRlclN0eWxlOjpkaWZmKGNvbnN0IFJlbmRlclN0eWxlKiBv dGhlcikgY29uc3QKK1N0eWxlRGlmZmVyZW5jZSBSZW5kZXJTdHlsZTo6ZGlmZihjb25zdCBSZW5k ZXJTdHlsZSogb3RoZXIsIHVuc2lnbmVkJiBjaGFuZ2VkQ29udGV4dFNlbnNpdGl2ZVByb3BlcnRp ZXMpIGNvbnN0CiB7CisgICAgY2hhbmdlZENvbnRleHRTZW5zaXRpdmVQcm9wZXJ0aWVzID0gQ29u dGV4dFNlbnNpdGl2ZVByb3BlcnR5Tm9uZTsKKwogI2lmIEVOQUJMRShTVkcpCiAgICAgLy8gVGhp cyBpcyBob3JyaWJseSBpbmVmZmljaWVudC4gIEV2ZW50dWFsbHkgd2UnbGwgaGF2ZSB0byBpbnRl Z3JhdGUKICAgICAvLyB0aGlzIG1vcmUgZGlyZWN0bHkgYnkgY2FsbGluZzogRGlmZiBzdmdEaWZm ID0gc3ZnU3R5bGUtPmRpZmYob3RoZXIpCkBAIC0zMjQsOCArMzI2LDE0IEBAIFN0eWxlRGlmZmVy ZW5jZSBSZW5kZXJTdHlsZTo6ZGlmZihjb25zdCBSZW5kZXJTdHlsZSogb3RoZXIpIGNvbnN0CiAg ICAgICAgICAgICByZXR1cm4gU3R5bGVEaWZmZXJlbmNlTGF5b3V0OwogCiAgICAgICAgIGlmIChy YXJlTm9uSW5oZXJpdGVkRGF0YS0+bV90cmFuc2Zvcm0uZ2V0KCkgIT0gb3RoZXItPnJhcmVOb25J bmhlcml0ZWREYXRhLT5tX3RyYW5zZm9ybS5nZXQoKSAmJgotICAgICAgICAgICAgKnJhcmVOb25J bmhlcml0ZWREYXRhLT5tX3RyYW5zZm9ybS5nZXQoKSAhPSAqb3RoZXItPnJhcmVOb25Jbmhlcml0 ZWREYXRhLT5tX3RyYW5zZm9ybS5nZXQoKSkKKyAgICAgICAgICAgICpyYXJlTm9uSW5oZXJpdGVk RGF0YS0+bV90cmFuc2Zvcm0uZ2V0KCkgIT0gKm90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+ bV90cmFuc2Zvcm0uZ2V0KCkpIHsKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisg ICAgICAgICAgICBjaGFuZ2VkQ29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMgfD0gQ29udGV4dFNl bnNpdGl2ZVByb3BlcnR5VHJhbnNmb3JtOworICAgICAgICAgICAgLy8gRG9uJ3QgcmV0dXJuOyBr ZWVwIGxvb2tpbmcgZm9yIGFub3RoZXIgY2hhbmdlCisjZWxzZQogICAgICAgICAgICAgcmV0dXJu IFN0eWxlRGlmZmVyZW5jZUxheW91dDsKKyNlbmRpZgorICAgICAgICB9CiAKICNpZiBFTkFCTEUo REFTSEJPQVJEX1NVUFBPUlQpCiAgICAgICAgIC8vIElmIHJlZ2lvbnMgY2hhbmdlLCB0cmlnZ2Vy IGEgcmVsYXlvdXQgdG8gcmUtY2FsYyByZWdpb25zLgpAQCAtNDQ1LDggKzQ1MywxNiBAQCBTdHls ZURpZmZlcmVuY2UgUmVuZGVyU3R5bGU6OmRpZmYoY29uc3QgUmVuZGVyU3R5bGUqIG90aGVyKSBj b25zdAogICAgICAgICAgICAgcmV0dXJuIFN0eWxlRGlmZmVyZW5jZVJlcGFpbnRMYXllcjsKICAg ICB9CiAKLSAgICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm9wYWNpdHkgIT0gb3RoZXItPnJh cmVOb25Jbmhlcml0ZWREYXRhLT5vcGFjaXR5IHx8Ci0gICAgICAgIHJhcmVOb25Jbmhlcml0ZWRE YXRhLT5tX21hc2sgIT0gb3RoZXItPnJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hc2sgfHwKKyAg ICBpZiAocmFyZU5vbkluaGVyaXRlZERhdGEtPm9wYWNpdHkgIT0gb3RoZXItPnJhcmVOb25Jbmhl cml0ZWREYXRhLT5vcGFjaXR5KSB7CisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQor ICAgICAgICBjaGFuZ2VkQ29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMgfD0gQ29udGV4dFNlbnNp dGl2ZVByb3BlcnR5T3BhY2l0eTsKKyAgICAgICAgLy8gRG9uJ3QgcmV0dXJuOyBrZWVwIGxvb2tp bmcgZm9yIGFub3RoZXIgY2hhbmdlLgorI2Vsc2UKKyAgICAgICAgcmV0dXJuIFN0eWxlRGlmZmVy ZW5jZVJlcGFpbnRMYXllcjsKKyNlbmRpZgorICAgIH0KKworICAgIGlmIChyYXJlTm9uSW5oZXJp dGVkRGF0YS0+bV9tYXNrICE9IG90aGVyLT5yYXJlTm9uSW5oZXJpdGVkRGF0YS0+bV9tYXNrIHx8 CiAgICAgICAgIHJhcmVOb25Jbmhlcml0ZWREYXRhLT5tX21hc2tCb3hJbWFnZSAhPSBvdGhlci0+ cmFyZU5vbkluaGVyaXRlZERhdGEtPm1fbWFza0JveEltYWdlKQogICAgICAgICByZXR1cm4gU3R5 bGVEaWZmZXJlbmNlUmVwYWludExheWVyOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oIGIvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5 bGUuaAppbmRleCA0M2ExN2Y2Li4yOTdmNDU1IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmlu Zy9zdHlsZS9SZW5kZXJTdHlsZS5oCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRl clN0eWxlLmgKQEAgLTk4Miw3ICs5ODIsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGluaGVyaXRl ZE5vdEVxdWFsKFJlbmRlclN0eWxlKikgY29uc3Q7CiAKLSAgICBTdHlsZURpZmZlcmVuY2UgZGlm Zihjb25zdCBSZW5kZXJTdHlsZSopIGNvbnN0OworICAgIFN0eWxlRGlmZmVyZW5jZSBkaWZmKGNv bnN0IFJlbmRlclN0eWxlKiwgdW5zaWduZWQmIGNoYW5nZWRDb250ZXh0U2Vuc2l0aXZlUHJvcGVy dGllcykgY29uc3Q7CiAKICAgICBib29sIGlzRGlzcGxheVJlcGxhY2VkVHlwZSgpIGNvbnN0CiAg ICAgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5bGUvUmVuZGVyU3R5bGVDb25z dGFudHMuaCBiL1dlYkNvcmUvcmVuZGVyaW5nL3N0eWxlL1JlbmRlclN0eWxlQ29uc3RhbnRzLmgK aW5kZXggMGFjODQzMi4uNWFhMThkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvc3R5 bGUvUmVuZGVyU3R5bGVDb25zdGFudHMuaAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9zdHlsZS9S ZW5kZXJTdHlsZUNvbnN0YW50cy5oCkBAIC0zOCwxNyArMzgsMzEgQEAgbmFtZXNwYWNlIFdlYkNv cmUgewogCiAvLyBUaGUgZGlmZmVyZW5jZSBiZXR3ZWVuIHR3byBzdHlsZXMuICBUaGUgZm9sbG93 aW5nIHZhbHVlcyBhcmUgdXNlZDoKIC8vICgxKSBTdHlsZURpZmZlcmVuY2VFcXVhbCAtIFRoZSB0 d28gc3R5bGVzIGFyZSBpZGVudGljYWwKLS8vICgyKSBTdHlsZURpZmZlcmVuY2VSZXBhaW50IC0g VGhlIG9iamVjdCBqdXN0IG5lZWRzIHRvIGJlIHJlcGFpbnRlZC4KLS8vICgzKSBTdHlsZURpZmZl cmVuY2VSZXBhaW50TGF5ZXIgLSBUaGUgbGF5ZXIgYW5kIGl0cyBkZXNjZW5kYW50IGxheWVycyBu ZWVkcyB0byBiZSByZXBhaW50ZWQuCi0vLyAoNCkgU3R5bGVEaWZmZXJlbmNlTGF5b3V0IC0gQSBs YXlvdXQgaXMgcmVxdWlyZWQuCisvLyAoMikgU3R5bGVEaWZmZXJlbmNlUmVjb21wb3NpdGVMYXll ciAtIFRoZSBsYXllciBuZWVkcyBpdHMgcG9zaXRpb24gYW5kIHRyYW5zZm9ybSB1cGRhdGVkLCBi dXQgbm8gcmVwYWludAorLy8gKDMpIFN0eWxlRGlmZmVyZW5jZVJlcGFpbnQgLSBUaGUgb2JqZWN0 IGp1c3QgbmVlZHMgdG8gYmUgcmVwYWludGVkLgorLy8gKDQpIFN0eWxlRGlmZmVyZW5jZVJlcGFp bnRMYXllciAtIFRoZSBsYXllciBhbmQgaXRzIGRlc2NlbmRhbnQgbGF5ZXJzIG5lZWRzIHRvIGJl IHJlcGFpbnRlZC4KKy8vICg1KSBTdHlsZURpZmZlcmVuY2VMYXlvdXQgLSBBIGxheW91dCBpcyBy ZXF1aXJlZC4KIGVudW0gU3R5bGVEaWZmZXJlbmNlIHsKICAgICBTdHlsZURpZmZlcmVuY2VFcXVh bCwKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisgICAgU3R5bGVEaWZmZXJlbmNl UmVjb21wb3NpdGVMYXllciwKKyNlbmRpZgogICAgIFN0eWxlRGlmZmVyZW5jZVJlcGFpbnQsCiAg ICAgU3R5bGVEaWZmZXJlbmNlUmVwYWludExheWVyLAogICAgIFN0eWxlRGlmZmVyZW5jZUxheW91 dFBvc2l0aW9uZWRNb3ZlbWVudE9ubHksCiAgICAgU3R5bGVEaWZmZXJlbmNlTGF5b3V0CiB9Owog CisvLyBXaGVuIHNvbWUgc3R5bGUgcHJvcGVydGllcyBjaGFuZ2UsIGRpZmZlcmVudCBhbW91bnRz IG9mIHdvcmsgaGF2ZSB0byBiZSBkb25lIGRlcGVuZGluZyBvbgorLy8gY29udGV4dCAoZS5nLiB3 aGV0aGVyIHRoZSBwcm9wZXJ0eSBpcyBjaGFuZ2luZyBvbiBhbiBlbGVtZW50IHdoaWNoIGhhcyBh IGNvbXBvc2l0aW5nIGxheWVyKS4KKy8vIEEgc2ltcGxlIFN0eWxlRGlmZmVyZW5jZSBkb2VzIG5v dCBwcm92aWRlIGVub3VnaCBpbmZvcm1hdGlvbiBzbyB3ZSByZXR1cm4gYSBiaXQgbWFzayBvZgor Ly8gU3R5bGVEaWZmZXJlbmNlQ29udGV4dFNlbnNpdGl2ZVByb3BlcnRpZXMgZnJvbSBSZW5kZXJT dHlsZTo6ZGlmZigpIHRvby4KK2VudW0gU3R5bGVEaWZmZXJlbmNlQ29udGV4dFNlbnNpdGl2ZVBy b3BlcnR5IHsKKyAgICBDb250ZXh0U2Vuc2l0aXZlUHJvcGVydHlOb25lID0gMCwKKyAgICBDb250 ZXh0U2Vuc2l0aXZlUHJvcGVydHlUcmFuc2Zvcm0gPSAoMSA8PCAwKSwKKyAgICBDb250ZXh0U2Vu c2l0aXZlUHJvcGVydHlPcGFjaXR5ID0gKDEgPDwgMSkKK307CisKIC8vIFN0YXRpYyBwc2V1ZG8g c3R5bGVzLiBEeW5hbWljIG9uZXMgYXJlIHByb2R1Y2VkIG9uIHRoZSBmbHkuCiBlbnVtIFBzZXVk b0lkIHsKICAgICBOT1BTRVVETywgRklSU1RfTElORSwgRklSU1RfTEVUVEVSLCBCRUZPUkUsIEFG VEVSLCBTRUxFQ1RJT04sIEZJUlNUX0xJTkVfSU5IRVJJVEVELCBTQ1JPTExCQVIsIEZJTEVfVVBM T0FEX0JVVFRPTiwgSU5QVVRfUExBQ0VIT0xERVIsCg==