133407 2014-05-30 09:07:01 -0700 Cleanup temporary setting of image interpolation quality in GraphicsContext::drawImage* 2014-05-30 16:03:45 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan commit-queue oldest_to_newest 1012624 0 zalan 2014-05-30 09:07:01 -0700 This is highly error prone with all the copy-paste code in GraphicsContext::drawImage, GraphicsContext::drawTiledImage, GraphicsContext::drawImageBuffer. if (useLowQualityScale) { InterpolationQuality previousInterpolationQuality = imageInterpolationQuality(); setImageInterpolationQuality(InterpolationNone); image->draw(this, styleColorSpace, dest, src, op, blendMode, useLowQualityScale); setImageInterpolationQuality(previousInterpolationQuality); } else image->draw(this, styleColorSpace, dest, src, op, blendMode, useLowQualityScale); 1012664 1 232301 zalan 2014-05-30 12:43:13 -0700 Created attachment 232301 Patch 1012668 2 232301 darin 2014-05-30 13:33:29 -0700 Comment on attachment 232301 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232301&action=review OK > Source/WebCore/platform/graphics/GraphicsContext.cpp:98 > + GraphicsContext* m_graphicsContext; Should use a reference instead of a pointer. > Source/WebCore/platform/graphics/GraphicsContext.cpp:100 > + InterpolationQuality m_newInterpolationQuality; Could just store a m_currentInterpolationQuality != m_newInterpolationQuality boolean instead. 1012669 3 zalan 2014-05-30 13:35:24 -0700 (In reply to comment #2) > (From update of attachment 232301 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232301&action=review > > OK > > > Source/WebCore/platform/graphics/GraphicsContext.cpp:98 > > + GraphicsContext* m_graphicsContext; > > Should use a reference instead of a pointer. > > > Source/WebCore/platform/graphics/GraphicsContext.cpp:100 > > + InterpolationQuality m_newInterpolationQuality; > > Could just store a m_currentInterpolationQuality != m_newInterpolationQuality boolean instead. Good point! I'll do that. 1012678 4 232303 zalan 2014-05-30 14:27:55 -0700 Created attachment 232303 Patch 1012679 5 232303 zalan 2014-05-30 14:28:09 -0700 Comment on attachment 232303 Patch EWSing 1012692 6 232303 commit-queue 2014-05-30 16:03:42 -0700 Comment on attachment 232303 Patch Clearing flags on attachment: 232303 Committed r169498: <http://trac.webkit.org/changeset/169498> 1012693 7 commit-queue 2014-05-30 16:03:45 -0700 All reviewed patches have been landed. Closing bug. 232301 2014-05-30 12:43:13 -0700 2014-05-30 14:27:52 -0700 Patch bug-133407-20140530124249.patch text/plain 6951 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3YWI2YjY3NzczZGM1 YTE4MjU4MDI0ZWRjMWFhMmJkZThmMzJiYi4uZWRkZTBhODk4ZTBhMDU1Y2IyNmFjOGEwNWYxMTYx ZThlNGM0OWIxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA1LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW51cCB0ZW1wb3Jhcnkg c2V0dGluZyBvZiBpbWFnZSBpbnRlcnBvbGF0aW9uIHF1YWxpdHkgaW4gR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzM0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGQgaGVscGVyIGNsYXNzIHRvIHNldC9yZXNldCBpbWFnZSBpbnRlcnBvbGF0aW9uIHF1 YWxpdHkgdmFsdWUuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyOjpJbnRlcnBvbGF0aW9uUXVh bGl0eU1haW50YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJwb2xhdGlvblF1YWxpdHlN YWludGFpbmVyOjp+SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyKToKKyAgICAgICAgKFdl YkNvcmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzQ29udGV4dDo6ZHJhd1RpbGVkSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhp Y3NDb250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIpOgorCisyMDE0LTA1LTMwICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBHcmFwaGljc0Nv bnRleHQ6OmRyYXdJbWFnZSgpIGZ1bmN0aW9uLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzQ3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCmluZGV4IDMzODZkZjFkNWExNmQ0 ZWZiMmJiZjIzYWVmNzhiMWYyMzA4ZDdjNDAuLmZiZmE0ODE2NzYxNjk5NzQ3MmMzMGJjYmNiZjky MjZhNDA2YzlkYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvR3JhcGhpY3NDb250ZXh0LmNwcApAQCAtNzcsNiArNzcsMjkgQEAgcHJpdmF0ZToKICAgICBp bnQgbV9vZmZzZXQ7CiB9OwogCitjbGFzcyBJbnRlcnBvbGF0aW9uUXVhbGl0eU1haW50YWluZXIg eworcHVibGljOgorICAgIGV4cGxpY2l0IEludGVycG9sYXRpb25RdWFsaXR5TWFpbnRhaW5lcihH cmFwaGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgSW50ZXJwb2xhdGlvblF1YWxpdHkgaW50 ZXJwb2xhdGlvblF1YWxpdHlUb1VzZSkKKyAgICAgICAgOiBtX2dyYXBoaWNzQ29udGV4dCgmZ3Jh cGhpY3NDb250ZXh0KQorICAgICAgICAsIG1fY3VycmVudEludGVycG9sYXRpb25RdWFsaXR5KGdy YXBoaWNzQ29udGV4dC5pbWFnZUludGVycG9sYXRpb25RdWFsaXR5KCkpCisgICAgICAgICwgbV9u ZXdJbnRlcnBvbGF0aW9uUXVhbGl0eShpbnRlcnBvbGF0aW9uUXVhbGl0eVRvVXNlKQorICAgIHsK KyAgICAgICAgaWYgKG1fY3VycmVudEludGVycG9sYXRpb25RdWFsaXR5ICE9IG1fbmV3SW50ZXJw b2xhdGlvblF1YWxpdHkpCisgICAgICAgICAgICBncmFwaGljc0NvbnRleHQuc2V0SW1hZ2VJbnRl cnBvbGF0aW9uUXVhbGl0eShtX25ld0ludGVycG9sYXRpb25RdWFsaXR5KTsKKyAgICB9CisKKyAg ICB+SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyKCkKKyAgICB7CisgICAgICAgIGlmICht X2N1cnJlbnRJbnRlcnBvbGF0aW9uUXVhbGl0eSAhPSBtX25ld0ludGVycG9sYXRpb25RdWFsaXR5 KQorICAgICAgICAgICAgbV9ncmFwaGljc0NvbnRleHQtPnNldEltYWdlSW50ZXJwb2xhdGlvblF1 YWxpdHkobV9jdXJyZW50SW50ZXJwb2xhdGlvblF1YWxpdHkpOworICAgIH0KKworcHJpdmF0ZToK KyAgICBHcmFwaGljc0NvbnRleHQqIG1fZ3JhcGhpY3NDb250ZXh0OworICAgIEludGVycG9sYXRp b25RdWFsaXR5IG1fY3VycmVudEludGVycG9sYXRpb25RdWFsaXR5OworICAgIEludGVycG9sYXRp b25RdWFsaXR5IG1fbmV3SW50ZXJwb2xhdGlvblF1YWxpdHk7Cit9OworCiAjaWYgIVBMQVRGT1JN KElPUykKIEdyYXBoaWNzQ29udGV4dDo6R3JhcGhpY3NDb250ZXh0KFBsYXRmb3JtR3JhcGhpY3ND b250ZXh0KiBwbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCkKICAgICA6IG1fdXBkYXRpbmdDb250cm9s VGludHMoZmFsc2UpCkBAIC01NjcsMjEgKzU5MCwxMyBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6 ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0 CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xv clNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0LCBjb25zdCBGbG9h dFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIEJsZW5kTW9kZSBibGVuZE1vZGUsIElt YWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlvbiwgYm9vbCB1c2VMb3dRdWFsaXR5 U2NhbGUpCi17ICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQoreworICAgIGlm IChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQogICAgICAgICByZXR1cm47Ci0KLSAgICBJ bnRlcnBvbGF0aW9uUXVhbGl0eSBwcmV2aW91c0ludGVycG9sYXRpb25RdWFsaXR5ID0gSW50ZXJw b2xhdGlvbkRlZmF1bHQ7Ci0KLSAgICBpZiAodXNlTG93UXVhbGl0eVNjYWxlKSB7Ci0gICAgICAg IHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5 KCk7Ci0gICAgICAgIC8vIEZJWE1FICg0OTAwMik6IFNob3VsZCBiZSBJbnRlcnBvbGF0aW9uTG93 Ci0gICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbk5vbmUp OwotICAgIH0KLQorICAgIAorICAgIC8vIEZJWE1FICg0OTAwMik6IFNob3VsZCBiZSBJbnRlcnBv bGF0aW9uTG93CisgICAgSW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyIGludGVycG9sYXRp b25RdWFsaXR5Rm9yVGhpc1Njb3BlKCp0aGlzLCB1c2VMb3dRdWFsaXR5U2NhbGUgPyBJbnRlcnBv bGF0aW9uTm9uZSA6IGltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoKSk7CiAgICAgaW1hZ2UtPmRy YXcodGhpcywgZGVzdCwgc3JjLCBzdHlsZUNvbG9yU3BhY2UsIG9wLCBibGVuZE1vZGUsIGRlc2Ny aXB0aW9uKTsKLQotICAgIGlmICh1c2VMb3dRdWFsaXR5U2NhbGUpCi0gICAgICAgIHNldEltYWdl SW50ZXJwb2xhdGlvblF1YWxpdHkocHJldmlvdXNJbnRlcnBvbGF0aW9uUXVhbGl0eSk7CiB9CiAK IHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGlsZWRJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9y U3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJlY3QmIGRlc3RSZWN0LCBjb25zdCBG bG9hdFBvaW50JiBzcmNQb2ludCwgY29uc3QgRmxvYXRTaXplJiB0aWxlU2l6ZSwgQ29tcG9zaXRl T3BlcmF0b3Igb3AsIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxlLCBCbGVuZE1vZGUgYmxlbmRNb2Rl KQpAQCAtNTg5LDEzICs2MDQsOCBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd1RpbGVkSW1h Z2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgYwogICAgIGlmIChw YWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAo dXNlTG93UXVhbGl0eVNjYWxlKSB7Ci0gICAgICAgIEludGVycG9sYXRpb25RdWFsaXR5IHByZXZp b3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0g ICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkxvdyk7Ci0g ICAgICAgIGltYWdlLT5kcmF3VGlsZWQodGhpcywgZGVzdFJlY3QsIHNyY1BvaW50LCB0aWxlU2l6 ZSwgc3R5bGVDb2xvclNwYWNlLCBvcCwgYmxlbmRNb2RlKTsKLSAgICAgICAgc2V0SW1hZ2VJbnRl cnBvbGF0aW9uUXVhbGl0eShwcmV2aW91c0ludGVycG9sYXRpb25RdWFsaXR5KTsKLSAgICB9IGVs c2UKLSAgICAgICAgaW1hZ2UtPmRyYXdUaWxlZCh0aGlzLCBkZXN0UmVjdCwgc3JjUG9pbnQsIHRp bGVTaXplLCBzdHlsZUNvbG9yU3BhY2UsIG9wLCBibGVuZE1vZGUpOworICAgIEludGVycG9sYXRp b25RdWFsaXR5TWFpbnRhaW5lciBpbnRlcnBvbGF0aW9uUXVhbGl0eUZvclRoaXNTY29wZSgqdGhp cywgdXNlTG93UXVhbGl0eVNjYWxlID8gSW50ZXJwb2xhdGlvbkxvdyA6IGltYWdlSW50ZXJwb2xh dGlvblF1YWxpdHkoKSk7CisgICAgaW1hZ2UtPmRyYXdUaWxlZCh0aGlzLCBkZXN0UmVjdCwgc3Jj UG9pbnQsIHRpbGVTaXplLCBzdHlsZUNvbG9yU3BhY2UsIG9wLCBibGVuZE1vZGUpOwogfQogCiB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd1RpbGVkSW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNw YWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0JiBkZXN0LCBjb25zdCBGbG9hdFJl Y3QmIHNyY1JlY3QsCkBAIC02MTAsMTMgKzYyMCw4IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0Ojpk cmF3VGlsZWRJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBj CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAodXNlTG93UXVhbGl0eVNjYWxlKSB7 Ci0gICAgICAgIEludGVycG9sYXRpb25RdWFsaXR5IHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxp dHkgPSBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0gICAgICAgIHNldEltYWdlSW50ZXJw b2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkxvdyk7Ci0gICAgICAgIGltYWdlLT5kcmF3VGls ZWQodGhpcywgZGVzdCwgc3JjUmVjdCwgdGlsZVNjYWxlRmFjdG9yLCBoUnVsZSwgdlJ1bGUsIHN0 eWxlQ29sb3JTcGFjZSwgb3ApOwotICAgICAgICBzZXRJbWFnZUludGVycG9sYXRpb25RdWFsaXR5 KHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkpOwotICAgIH0gZWxzZQotICAgICAgICBpbWFn ZS0+ZHJhd1RpbGVkKHRoaXMsIGRlc3QsIHNyY1JlY3QsIHRpbGVTY2FsZUZhY3RvciwgaFJ1bGUs IHZSdWxlLCBzdHlsZUNvbG9yU3BhY2UsIG9wKTsKKyAgICBJbnRlcnBvbGF0aW9uUXVhbGl0eU1h aW50YWluZXIgaW50ZXJwb2xhdGlvblF1YWxpdHlGb3JUaGlzU2NvcGUoKnRoaXMsIHVzZUxvd1F1 YWxpdHlTY2FsZSA/IEludGVycG9sYXRpb25Mb3cgOiBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5 KCkpOworICAgIGltYWdlLT5kcmF3VGlsZWQodGhpcywgZGVzdCwgc3JjUmVjdCwgdGlsZVNjYWxl RmFjdG9yLCBoUnVsZSwgdlJ1bGUsIHN0eWxlQ29sb3JTcGFjZSwgb3ApOwogfQogCiB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyKiBpbWFnZSwgQ29sb3JT cGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9pbnQmIHAsIENvbXBvc2l0ZU9wZXJh dG9yIG9wLCBCbGVuZE1vZGUgYmxlbmRNb2RlKQpAQCAtNjQzLDE0ICs2NDgsOSBAQCB2b2lkIEdy YXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdlQnVmZmVyKiBpbWFnZSwgQ29sb3JT cGFjZSBzdHlsZUNvbG9yUwogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpZiAodXNlTG93UXVhbGl0eVNjYWxlKSB7Ci0gICAgICAg IEludGVycG9sYXRpb25RdWFsaXR5IHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFn ZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0gICAgICAgIC8vIEZJWE1FICg0OTAwMik6IFNob3Vs ZCBiZSBJbnRlcnBvbGF0aW9uTG93Ci0gICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxp dHkoSW50ZXJwb2xhdGlvbk5vbmUpOwotICAgICAgICBpbWFnZS0+ZHJhdyh0aGlzLCBzdHlsZUNv bG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIGJsZW5kTW9kZSwgdXNlTG93UXVhbGl0eVNjYWxlKTsK LSAgICAgICAgc2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShwcmV2aW91c0ludGVycG9sYXRp b25RdWFsaXR5KTsKLSAgICB9IGVsc2UKLSAgICAgICAgaW1hZ2UtPmRyYXcodGhpcywgc3R5bGVD b2xvclNwYWNlLCBkZXN0LCBzcmMsIG9wLCBibGVuZE1vZGUsIHVzZUxvd1F1YWxpdHlTY2FsZSk7 CisgICAgLy8gRklYTUUgKDQ5MDAyKTogU2hvdWxkIGJlIEludGVycG9sYXRpb25Mb3cKKyAgICBJ bnRlcnBvbGF0aW9uUXVhbGl0eU1haW50YWluZXIgaW50ZXJwb2xhdGlvblF1YWxpdHlGb3JUaGlz U2NvcGUoKnRoaXMsIHVzZUxvd1F1YWxpdHlTY2FsZSA/IEludGVycG9sYXRpb25Ob25lIDogaW1h Z2VJbnRlcnBvbGF0aW9uUXVhbGl0eSgpKTsKKyAgICBpbWFnZS0+ZHJhdyh0aGlzLCBzdHlsZUNv bG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIGJsZW5kTW9kZSwgdXNlTG93UXVhbGl0eVNjYWxlKTsK IH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29uc3QgSW50UmVjdCYgcmVjdCkK 232303 2014-05-30 14:27:55 -0700 2014-05-30 16:03:41 -0700 Patch bug-133407-20140530142731.patch text/plain 6915 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTQ3YWI2YjY3NzczZGM1 YTE4MjU4MDI0ZWRjMWFhMmJkZThmMzJiYi4uMDdjZDk1NGMzZTRlMDVjMDMzZjEwMmUwZmZiNTIw NWNhMzFhNjFiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE0LTA1LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW51cCB0ZW1wb3Jhcnkg c2V0dGluZyBvZiBpbWFnZSBpbnRlcnBvbGF0aW9uIHF1YWxpdHkgaW4gR3JhcGhpY3NDb250ZXh0 OjpkcmF3SW1hZ2UqCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzM0MDcKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAg ICBBZGQgaGVscGVyIGNsYXNzIHRvIHNldC9yZXNldCBpbWFnZSBpbnRlcnBvbGF0aW9uIHF1YWxp dHkgdmFsdWUuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyOjpJbnRlcnBvbGF0aW9uUXVhbGl0 eU1haW50YWluZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJwb2xhdGlvblF1YWxpdHlNYWlu dGFpbmVyOjp+SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyKToKKyAgICAgICAgKFdlYkNv cmU6OkdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzQ29udGV4dDo6ZHJhd1RpbGVkSW1hZ2UpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3ND b250ZXh0OjpkcmF3SW1hZ2VCdWZmZXIpOgorCisyMDE0LTA1LTMwICBaYWxhbiBCdWp0YXMgIDx6 YWxhbkBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlIHJlZHVuZGFudCBHcmFwaGljc0NvbnRl eHQ6OmRyYXdJbWFnZSgpIGZ1bmN0aW9uLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzQ3CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0dyYXBoaWNzQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9HcmFwaGljc0NvbnRleHQuY3BwCmluZGV4IDMzODZkZjFkNWExNmQ0ZWZi MmJiZjIzYWVmNzhiMWYyMzA4ZDdjNDAuLjFiMGM2NTc0YWM2MmFlMDNlODI4MGJmMjdkYzMyYmIz YjVjZTA0NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0dy YXBoaWNzQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv R3JhcGhpY3NDb250ZXh0LmNwcApAQCAtNzcsNiArNzcsMjkgQEAgcHJpdmF0ZToKICAgICBpbnQg bV9vZmZzZXQ7CiB9OwogCitjbGFzcyBJbnRlcnBvbGF0aW9uUXVhbGl0eU1haW50YWluZXIgewor cHVibGljOgorICAgIGV4cGxpY2l0IEludGVycG9sYXRpb25RdWFsaXR5TWFpbnRhaW5lcihHcmFw aGljc0NvbnRleHQmIGdyYXBoaWNzQ29udGV4dCwgSW50ZXJwb2xhdGlvblF1YWxpdHkgaW50ZXJw b2xhdGlvblF1YWxpdHlUb1VzZSkKKyAgICAgICAgOiBtX2dyYXBoaWNzQ29udGV4dChncmFwaGlj c0NvbnRleHQpCisgICAgICAgICwgbV9jdXJyZW50SW50ZXJwb2xhdGlvblF1YWxpdHkoZ3JhcGhp Y3NDb250ZXh0LmltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoKSkKKyAgICAgICAgLCBtX2ludGVy cG9sYXRpb25RdWFsaXR5Q2hhbmdlZChtX2N1cnJlbnRJbnRlcnBvbGF0aW9uUXVhbGl0eSAhPSBp bnRlcnBvbGF0aW9uUXVhbGl0eVRvVXNlKQorICAgIHsKKyAgICAgICAgaWYgKG1faW50ZXJwb2xh dGlvblF1YWxpdHlDaGFuZ2VkKQorICAgICAgICAgICAgbV9ncmFwaGljc0NvbnRleHQuc2V0SW1h Z2VJbnRlcnBvbGF0aW9uUXVhbGl0eShpbnRlcnBvbGF0aW9uUXVhbGl0eVRvVXNlKTsKKyAgICB9 CisKKyAgICB+SW50ZXJwb2xhdGlvblF1YWxpdHlNYWludGFpbmVyKCkKKyAgICB7CisgICAgICAg IGlmIChtX2ludGVycG9sYXRpb25RdWFsaXR5Q2hhbmdlZCkKKyAgICAgICAgICAgIG1fZ3JhcGhp Y3NDb250ZXh0LnNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkobV9jdXJyZW50SW50ZXJwb2xh dGlvblF1YWxpdHkpOworICAgIH0KKworcHJpdmF0ZToKKyAgICBHcmFwaGljc0NvbnRleHQmIG1f Z3JhcGhpY3NDb250ZXh0OworICAgIEludGVycG9sYXRpb25RdWFsaXR5IG1fY3VycmVudEludGVy cG9sYXRpb25RdWFsaXR5OworICAgIGJvb2wgbV9pbnRlcnBvbGF0aW9uUXVhbGl0eUNoYW5nZWQ7 Cit9OworCiAjaWYgIVBMQVRGT1JNKElPUykKIEdyYXBoaWNzQ29udGV4dDo6R3JhcGhpY3NDb250 ZXh0KFBsYXRmb3JtR3JhcGhpY3NDb250ZXh0KiBwbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCkKICAg ICA6IG1fdXBkYXRpbmdDb250cm9sVGludHMoZmFsc2UpCkBAIC01NjcsMjEgKzU5MCwxMyBAQCB2 b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlKEltYWdlKiBpbWFnZSwgQ29sb3JTcGFjZSBz dHlsZUNvbG9yU3BhY2UsIGNvbnN0CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3SW1h Z2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRS ZWN0JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyYywgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIEJs ZW5kTW9kZSBibGVuZE1vZGUsIEltYWdlT3JpZW50YXRpb25EZXNjcmlwdGlvbiBkZXNjcmlwdGlv biwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUpCi17ICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkg fHwgIWltYWdlKQoreworICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQogICAg ICAgICByZXR1cm47Ci0KLSAgICBJbnRlcnBvbGF0aW9uUXVhbGl0eSBwcmV2aW91c0ludGVycG9s YXRpb25RdWFsaXR5ID0gSW50ZXJwb2xhdGlvbkRlZmF1bHQ7Ci0KLSAgICBpZiAodXNlTG93UXVh bGl0eVNjYWxlKSB7Ci0gICAgICAgIHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFn ZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0gICAgICAgIC8vIEZJWE1FICg0OTAwMik6IFNob3Vs ZCBiZSBJbnRlcnBvbGF0aW9uTG93Ci0gICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxp dHkoSW50ZXJwb2xhdGlvbk5vbmUpOwotICAgIH0KLQorICAgIAorICAgIC8vIEZJWE1FICg0OTAw Mik6IFNob3VsZCBiZSBJbnRlcnBvbGF0aW9uTG93CisgICAgSW50ZXJwb2xhdGlvblF1YWxpdHlN YWludGFpbmVyIGludGVycG9sYXRpb25RdWFsaXR5Rm9yVGhpc1Njb3BlKCp0aGlzLCB1c2VMb3dR dWFsaXR5U2NhbGUgPyBJbnRlcnBvbGF0aW9uTm9uZSA6IGltYWdlSW50ZXJwb2xhdGlvblF1YWxp dHkoKSk7CiAgICAgaW1hZ2UtPmRyYXcodGhpcywgZGVzdCwgc3JjLCBzdHlsZUNvbG9yU3BhY2Us IG9wLCBibGVuZE1vZGUsIGRlc2NyaXB0aW9uKTsKLQotICAgIGlmICh1c2VMb3dRdWFsaXR5U2Nh bGUpCi0gICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkocHJldmlvdXNJbnRlcnBv bGF0aW9uUXVhbGl0eSk7CiB9CiAKIHZvaWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGlsZWRJbWFn ZShJbWFnZSogaW1hZ2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9hdFJl Y3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFBvaW50JiBzcmNQb2ludCwgY29uc3QgRmxvYXRTaXpl JiB0aWxlU2l6ZSwgQ29tcG9zaXRlT3BlcmF0b3Igb3AsIGJvb2wgdXNlTG93UXVhbGl0eVNjYWxl LCBCbGVuZE1vZGUgYmxlbmRNb2RlKQpAQCAtNTg5LDEzICs2MDQsOCBAQCB2b2lkIEdyYXBoaWNz Q29udGV4dDo6ZHJhd1RpbGVkSW1hZ2UoSW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29s b3JTcGFjZSwgYwogICAgIGlmIChwYWludGluZ0Rpc2FibGVkKCkgfHwgIWltYWdlKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAodXNlTG93UXVhbGl0eVNjYWxlKSB7Ci0gICAgICAgIEludGVy cG9sYXRpb25RdWFsaXR5IHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFnZUludGVy cG9sYXRpb25RdWFsaXR5KCk7Ci0gICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHko SW50ZXJwb2xhdGlvbkxvdyk7Ci0gICAgICAgIGltYWdlLT5kcmF3VGlsZWQodGhpcywgZGVzdFJl Y3QsIHNyY1BvaW50LCB0aWxlU2l6ZSwgc3R5bGVDb2xvclNwYWNlLCBvcCwgYmxlbmRNb2RlKTsK LSAgICAgICAgc2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eShwcmV2aW91c0ludGVycG9sYXRp b25RdWFsaXR5KTsKLSAgICB9IGVsc2UKLSAgICAgICAgaW1hZ2UtPmRyYXdUaWxlZCh0aGlzLCBk ZXN0UmVjdCwgc3JjUG9pbnQsIHRpbGVTaXplLCBzdHlsZUNvbG9yU3BhY2UsIG9wLCBibGVuZE1v ZGUpOworICAgIEludGVycG9sYXRpb25RdWFsaXR5TWFpbnRhaW5lciBpbnRlcnBvbGF0aW9uUXVh bGl0eUZvclRoaXNTY29wZSgqdGhpcywgdXNlTG93UXVhbGl0eVNjYWxlID8gSW50ZXJwb2xhdGlv bkxvdyA6IGltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoKSk7CisgICAgaW1hZ2UtPmRyYXdUaWxl ZCh0aGlzLCBkZXN0UmVjdCwgc3JjUG9pbnQsIHRpbGVTaXplLCBzdHlsZUNvbG9yU3BhY2UsIG9w LCBibGVuZE1vZGUpOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd1RpbGVkSW1hZ2Uo SW1hZ2UqIGltYWdlLCBDb2xvclNwYWNlIHN0eWxlQ29sb3JTcGFjZSwgY29uc3QgRmxvYXRSZWN0 JiBkZXN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsCkBAIC02MTAsMTMgKzYyMCw4IEBAIHZv aWQgR3JhcGhpY3NDb250ZXh0OjpkcmF3VGlsZWRJbWFnZShJbWFnZSogaW1hZ2UsIENvbG9yU3Bh Y2Ugc3R5bGVDb2xvclNwYWNlLCBjCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAo dXNlTG93UXVhbGl0eVNjYWxlKSB7Ci0gICAgICAgIEludGVycG9sYXRpb25RdWFsaXR5IHByZXZp b3VzSW50ZXJwb2xhdGlvblF1YWxpdHkgPSBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0g ICAgICAgIHNldEltYWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbkxvdyk7Ci0g ICAgICAgIGltYWdlLT5kcmF3VGlsZWQodGhpcywgZGVzdCwgc3JjUmVjdCwgdGlsZVNjYWxlRmFj dG9yLCBoUnVsZSwgdlJ1bGUsIHN0eWxlQ29sb3JTcGFjZSwgb3ApOwotICAgICAgICBzZXRJbWFn ZUludGVycG9sYXRpb25RdWFsaXR5KHByZXZpb3VzSW50ZXJwb2xhdGlvblF1YWxpdHkpOwotICAg IH0gZWxzZQotICAgICAgICBpbWFnZS0+ZHJhd1RpbGVkKHRoaXMsIGRlc3QsIHNyY1JlY3QsIHRp bGVTY2FsZUZhY3RvciwgaFJ1bGUsIHZSdWxlLCBzdHlsZUNvbG9yU3BhY2UsIG9wKTsKKyAgICBJ bnRlcnBvbGF0aW9uUXVhbGl0eU1haW50YWluZXIgaW50ZXJwb2xhdGlvblF1YWxpdHlGb3JUaGlz U2NvcGUoKnRoaXMsIHVzZUxvd1F1YWxpdHlTY2FsZSA/IEludGVycG9sYXRpb25Mb3cgOiBpbWFn ZUludGVycG9sYXRpb25RdWFsaXR5KCkpOworICAgIGltYWdlLT5kcmF3VGlsZWQodGhpcywgZGVz dCwgc3JjUmVjdCwgdGlsZVNjYWxlRmFjdG9yLCBoUnVsZSwgdlJ1bGUsIHN0eWxlQ29sb3JTcGFj ZSwgb3ApOwogfQogCiB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdl QnVmZmVyKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIGNvbnN0IEZsb2F0UG9p bnQmIHAsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBCbGVuZE1vZGUgYmxlbmRNb2RlKQpAQCAtNjQz LDE0ICs2NDgsOSBAQCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6ZHJhd0ltYWdlQnVmZmVyKEltYWdl QnVmZmVyKiBpbWFnZSwgQ29sb3JTcGFjZSBzdHlsZUNvbG9yUwogICAgIGlmIChwYWludGluZ0Rp c2FibGVkKCkgfHwgIWltYWdlKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAodXNlTG93UXVh bGl0eVNjYWxlKSB7Ci0gICAgICAgIEludGVycG9sYXRpb25RdWFsaXR5IHByZXZpb3VzSW50ZXJw b2xhdGlvblF1YWxpdHkgPSBpbWFnZUludGVycG9sYXRpb25RdWFsaXR5KCk7Ci0gICAgICAgIC8v IEZJWE1FICg0OTAwMik6IFNob3VsZCBiZSBJbnRlcnBvbGF0aW9uTG93Ci0gICAgICAgIHNldElt YWdlSW50ZXJwb2xhdGlvblF1YWxpdHkoSW50ZXJwb2xhdGlvbk5vbmUpOwotICAgICAgICBpbWFn ZS0+ZHJhdyh0aGlzLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIGJsZW5kTW9kZSwg dXNlTG93UXVhbGl0eVNjYWxlKTsKLSAgICAgICAgc2V0SW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0 eShwcmV2aW91c0ludGVycG9sYXRpb25RdWFsaXR5KTsKLSAgICB9IGVsc2UKLSAgICAgICAgaW1h Z2UtPmRyYXcodGhpcywgc3R5bGVDb2xvclNwYWNlLCBkZXN0LCBzcmMsIG9wLCBibGVuZE1vZGUs IHVzZUxvd1F1YWxpdHlTY2FsZSk7CisgICAgLy8gRklYTUUgKDQ5MDAyKTogU2hvdWxkIGJlIElu dGVycG9sYXRpb25Mb3cKKyAgICBJbnRlcnBvbGF0aW9uUXVhbGl0eU1haW50YWluZXIgaW50ZXJw b2xhdGlvblF1YWxpdHlGb3JUaGlzU2NvcGUoKnRoaXMsIHVzZUxvd1F1YWxpdHlTY2FsZSA/IElu dGVycG9sYXRpb25Ob25lIDogaW1hZ2VJbnRlcnBvbGF0aW9uUXVhbGl0eSgpKTsKKyAgICBpbWFn ZS0+ZHJhdyh0aGlzLCBzdHlsZUNvbG9yU3BhY2UsIGRlc3QsIHNyYywgb3AsIGJsZW5kTW9kZSwg dXNlTG93UXVhbGl0eVNjYWxlKTsKIH0KIAogdm9pZCBHcmFwaGljc0NvbnRleHQ6OmNsaXAoY29u c3QgSW50UmVjdCYgcmVjdCkK