46955 2010-09-30 19:42:54 -0700 [Chromium] build fails unless ACCELERATED_2D_CANVAS defined 2010-09-30 22:58:53 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 morrita morrita jamesr oldest_to_newest 288018 0 morrita 2010-09-30 19:42:54 -0700 found at buildbot. out/Release/obj.target/third_party/WebKit/WebKit/chromium/libwebkit.a(WebViewImpl.o): In function `WTF::RefCounted<WebCore::SharedGraphicsContext3D>::deref()': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:139: undefined reference to `WebCore::SharedGraphicsContext3D::~SharedGraphicsContext3D()' out/Release/obj.target/third_party/WebKit/WebKit/chromium/libwebkit.a(WebViewImpl.o): In function `WebKit::WebViewImpl::getSharedGraphicsContext3D()': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebKit/chromium/src/WebViewImpl.cpp:2433: undefined reference to `WebCore::SharedGraphicsContext3D::create(WTF::PassOwnPtr<WebCore::GraphicsContext3D>)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(ImageSkia.o): In function `WebCore::drawBitmapGLES2(WebCore::GraphicsContext*, WebCore::NativeImageSkia*, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::ColorSpace, WebCore::CompositeOperator)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/ImageSkia.cpp:424: undefined reference to `WebCore::Texture::load(void*)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(NativeImageSkia.o): In function `~NativeImageSkia': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/NativeImageSkia.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::removeTexturesFor(WebCore::NativeImageSkia*)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/NativeImageSkia.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::removeTexturesFor(WebCore::NativeImageSkia*)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WebCore::PlatformContextSkia::readbackHardwareToSoftware() const': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:841: undefined reference to `WebCore::SharedGraphicsContext3D::supportsBGRA()' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:842: undefined reference to `WebCore::SharedGraphicsContext3D::readPixels(long, long, unsigned long, unsigned long, unsigned long, unsigned long, void*)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:844: undefined reference to `WebCore::SharedGraphicsContext3D::readPixels(long, long, unsigned long, unsigned long, unsigned long, unsigned long, void*)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WTF::RefCounted<WebCore::Texture>::deref()': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/JavaScriptCore/wtf/RefCounted.h:139: undefined reference to `WebCore::Texture::~Texture()' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(PlatformContextSkia.o): In function `WebCore::PlatformContextSkia::uploadSoftwareToHardware(WebCore::CompositeOperator) const': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:815: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture(WebCore::Texture::Format, int, int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/skia/PlatformContextSkia.cpp:817: undefined reference to `WebCore::Texture::updateSubRect(void*, WebCore::IntRect)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `WebCore::DrawingBuffer::reset(WebCore::IntSize const&)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:113: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:114: undefined reference to `WebCore::SharedGraphicsContext3D::texImage2D(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, void*)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `~DrawingBuffer': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:85: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:86: undefined reference to `WebCore::SharedGraphicsContext3D::deleteTexture(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:87: undefined reference to `WebCore::SharedGraphicsContext3D::deleteFramebuffer(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:85: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:86: undefined reference to `WebCore::SharedGraphicsContext3D::deleteTexture(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:87: undefined reference to `WebCore::SharedGraphicsContext3D::deleteFramebuffer(unsigned int)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `WebCore::generateColorTexture(WebCore::SharedGraphicsContext3D*, WebCore::IntSize const&)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:53: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture()' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:57: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:58: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:59: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:60: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:61: undefined reference to `WebCore::SharedGraphicsContext3D::texParameteri(unsigned int, unsigned int, int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:62: undefined reference to `WebCore::SharedGraphicsContext3D::texImage2D(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int, void*)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:63: undefined reference to `WebCore::SharedGraphicsContext3D::framebufferTexture2D(unsigned long, unsigned long, unsigned long, unsigned int, long)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(DrawingBufferChromium.o): In function `DrawingBuffer': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:75: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp:75: undefined reference to `WebCore::SharedGraphicsContext3D::bindFramebuffer(unsigned int)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::getTexture(WebCore::NativeImageSkia*)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:251: undefined reference to `WebCore::SharedGraphicsContext3D::getTexture(WebCore::NativeImageSkia*)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::createTexture(WebCore::NativeImageSkia*, WebCore::Texture::Format, int, int)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:246: undefined reference to `WebCore::SharedGraphicsContext3D::createTexture(WebCore::NativeImageSkia*, WebCore::Texture::Format, int, int)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::bindFramebuffer()': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:85: undefined reference to `WebCore::DrawingBuffer::bind()' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawQuad(WebCore::IntSize const&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:234: undefined reference to `WebCore::SharedGraphicsContext3D::useTextureProgram(WebCore::AffineTransform const&, WebCore::AffineTransform const&, float)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:235: undefined reference to `WebCore::SharedGraphicsContext3D::drawArrays(unsigned long, long, long)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRectTile(WebCore::Texture*, int, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:209: undefined reference to `WebCore::Texture::bindTile(int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:213: undefined reference to `WebCore::TilingData::intersectDrawQuad(WebCore::FloatRect const&, WebCore::FloatRect const&, int, WebCore::FloatRect*, WebCore::FloatRect*) const' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:215: undefined reference to `WebCore::TilingData::tileBoundsWithBorder(int) const' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRect(WebCore::Texture*, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::AffineTransform const&, float, WebCore::ColorSpace, WebCore::CompositeOperator)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:189: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:191: undefined reference to `WebCore::TilingData::overlappedTileIndices(WebCore::FloatRect const&) const' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:193: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:194: undefined reference to `WebCore::SharedGraphicsContext3D::setActiveTexture(unsigned int)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::drawTexturedRect(unsigned int, WebCore::IntSize const&, WebCore::FloatRect const&, WebCore::FloatRect const&, WebCore::ColorSpace, WebCore::CompositeOperator)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:171: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:173: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:174: undefined reference to `WebCore::SharedGraphicsContext3D::setActiveTexture(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:176: undefined reference to `WebCore::SharedGraphicsContext3D::bindTexture(unsigned int, unsigned int)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::fillRect(WebCore::FloatRect const&, WebCore::Color const&, WebCore::ColorSpace)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:107: undefined reference to `WebCore::SharedGraphicsContext3D::applyCompositeOperator(WebCore::CompositeOperator)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:108: undefined reference to `WebCore::SharedGraphicsContext3D::useQuadVertices()' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:115: undefined reference to `WebCore::SharedGraphicsContext3D::useFillSolidProgram(WebCore::AffineTransform const&, WebCore::Color const&)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:118: undefined reference to `WebCore::SharedGraphicsContext3D::drawArrays(unsigned long, long, long)' out/Release/obj.target/third_party/WebKit/WebCore/WebCore.gyp/libwebcore_platform.a(GLES2Canvas.o): In function `WebCore::GLES2Canvas::clearRect(WebCore::FloatRect const&)': /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:92: undefined reference to `WebCore::SharedGraphicsContext3D::scissor(WebCore::FloatRect const&)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:93: undefined reference to `WebCore::SharedGraphicsContext3D::enable(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:94: undefined reference to `WebCore::SharedGraphicsContext3D::clearColor(WebCore::Color const&)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:95: undefined reference to `WebCore::SharedGraphicsContext3D::clear(unsigned int)' /b/slave/chromium-rel-chromeos-valgrind-tests-1/build/src/third_party/WebKit/WebCore/platform/graphics/chromium/GLES2Canvas.cpp:96: undefined reference to `WebCore::SharedGraphicsContext3D::disable(unsigned int)' 288050 1 69421 morrita 2010-09-30 21:55:47 -0700 Created attachment 69421 Patch 288053 2 69421 jamesr 2010-09-30 22:02:10 -0700 Comment on attachment 69421 Patch Thanks for cleaning this up. Needs a few things, though: ENABLE(ACCELERATED_2D_CANVAS), not ENABLE(ENABLE_ACCELERATED_2D_CANVAS). The ASSERT()s and NOT_REACHED() are unnecessary, those functions should just be no-ops if the ENABLE() isn't set. 288060 3 69422 morrita 2010-09-30 22:41:32 -0700 Created attachment 69422 Patch 288061 4 morrita 2010-09-30 22:42:48 -0700 Hi James, thank you for reviewing! I updated the patch: > ENABLE(ACCELERATED_2D_CANVAS), not ENABLE(ENABLE_ACCELERATED_2D_CANVAS). Done. > The ASSERT()s and NOT_REACHED() are unnecessary, those functions should just be no-ops if the ENABLE() isn't set. Remove assert()-s. 288062 5 69422 jamesr 2010-09-30 22:47:59 -0700 Comment on attachment 69422 Patch R=me. thanks 288067 6 morrita 2010-09-30 22:58:53 -0700 Committed r68865: <http://trac.webkit.org/changeset/68865> 69421 2010-09-30 21:55:47 -0700 2010-09-30 22:41:27 -0700 Patch bug-46955-20101001135545.patch text/plain 8228 morrita ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWViZTg1NjkxMGE1NDQ3N2FiYzdmZDgyYzYwMTA5NTU1YzExYzBmYy4uZTAxNmFlMzMwNTVjZDZj NWJhNWIxNDBhMWUzMWRjMThkOWI1MDI2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0zMCAgTU9S SVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIGJ1aWxkIGZhaWxzIHVubGVzcyBB Q0NFTEVSQVRFRF8yRF9DQU5WQVMgZGVmaW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5NTUKKyAgICAgICAgCisgICAgICAgIEFkZGVkIGlmZGVm IGd1YXJkIGFyb3VuZCBTaGFyZWRHcmFwaGljc0NvbnRleHQzRC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIGp1c3QgYSBidWlsZCBmaXguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1D b250ZXh0U2tpYTo6flBsYXRmb3JtQ29udGV4dFNraWEpOgorICAgICAgICAoV2ViQ29yZTo6UGxh dGZvcm1Db250ZXh0U2tpYTo6c2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6dXBsb2FkU29mdHdhcmVUb0hhcmR3YXJlKToK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVU b1NvZnR3YXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OmdwdUNh bnZhcyk6CisKIDIwMTAtMDktMzAgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIFdpbmRvd3MgYnVpbGQgZml4IGZvciByNjg4NTQKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcAppbmRleCBiNDY5MzEyZmEwOThmNmI1OGNjZDVhOGQ4Y2Q0Y2ZmZDE0YTFlYzJmLi4wYTk3 NDIxNTEyYTdjM2QzNjc0MWY4ZDA4NDEyMGM4YzUyMmZmMzUyIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCkBAIC0z NCwxMiArMzQsMTAgQEAKIAogI2luY2x1ZGUgIkFmZmluZVRyYW5zZm9ybS5oIgogI2luY2x1ZGUg IkRyYXdpbmdCdWZmZXIuaCIKLSNpbmNsdWRlICJHTEVTMkNhbnZhcy5oIgogI2luY2x1ZGUgIkdy YXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVk ZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKLSNpbmNsdWRl ICJTaGFyZWRHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgogI2lu Y2x1ZGUgIlRleHR1cmUuaCIKICNpbmNsdWRlICJUaWxpbmdEYXRhLmgiCkBAIC01Niw2ICs1NCwx MSBAQAogI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KIAorI2lmIEVOQUJMRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTKQorI2luY2x1ZGUg IkdMRVMyQ2FudmFzLmgiCisjaW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaCIKKyNl bmRpZgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGV4dGVybiBib29sIGlzUGF0aFNraWFTYWZl KGNvbnN0IFNrTWF0cml4JiB0cmFuc2Zvcm0sIGNvbnN0IFNrUGF0aCYgcGF0aCk7CkBAIC0yMTYs OCArMjE5LDEwIEBAIFBsYXRmb3JtQ29udGV4dFNraWE6OlBsYXRmb3JtQ29udGV4dFNraWEoc2tp YTo6UGxhdGZvcm1DYW52YXMqIGNhbnZhcykKIAogUGxhdGZvcm1Db250ZXh0U2tpYTo6flBsYXRm b3JtQ29udGV4dFNraWEoKQogeworI2lmIEVOQUJMRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FO VkFTKQogICAgIGlmIChtX2dwdUNhbnZhcykKICAgICAgICAgbV9ncHVDYW52YXMtPmRyYXdpbmdC dWZmZXIoKS0+c2V0V2lsbFB1Ymxpc2hDYWxsYmFjaygwKTsKKyNlbmRpZgogfQogCiB2b2lkIFBs YXRmb3JtQ29udGV4dFNraWE6OnNldENhbnZhcyhza2lhOjpQbGF0Zm9ybUNhbnZhcyogY2FudmFz KQpAQCAtNzA1LDYgKzcxMCw3IEBAIHByaXZhdGU6CiAKIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tp YTo6c2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QqIGNv bnRleHQsIERyYXdpbmdCdWZmZXIqIGRyYXdpbmdCdWZmZXIsIGNvbnN0IFdlYkNvcmU6OkludFNp emUmIHNpemUpCiB7CisjaWYgRU5BQkxFKEVOQUJMRV9BQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAg ICAgaWYgKGNvbnRleHQgJiYgZHJhd2luZ0J1ZmZlcikgewogICAgICAgICBtX3VzZUdQVSA9IHRy dWU7CiAgICAgICAgIG1fZ3B1Q2FudmFzID0gbmV3IEdMRVMyQ2FudmFzKGNvbnRleHQsIGRyYXdp bmdCdWZmZXIsIHNpemUpOwpAQCAtNzE2LDYgKzcyMiwxMCBAQCB2b2lkIFBsYXRmb3JtQ29udGV4 dFNraWE6OnNldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKFNoYXJlZEdyYXBoaWNzQ29udGV4dDNE KiBjbwogICAgICAgICBtX2dwdUNhbnZhcy5jbGVhcigpOwogICAgICAgICBtX3VzZUdQVSA9IGZh bHNlOwogICAgIH0KKyNlbHNlCisgICAgLy8gd2UgbmV2ZXIgaGF2ZSBTaGFyZWRHcmFwaGljc0Nv bnRleHQzRCBpbiB0aGlzIGNhc2UuCisgICAgQVNTRVJUKCFjb250ZXh0KTsKKyNlbmRpZgogfQog CiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnByZXBhcmVGb3JTb2Z0d2FyZURyYXcoKSBjb25z dApAQCAtODA4LDYgKzgxOCw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6bWFya0RpcnR5 UmVjdChjb25zdCBJbnRSZWN0JiByZWN0KQogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnVw bG9hZFNvZnR3YXJlVG9IYXJkd2FyZShDb21wb3NpdGVPcGVyYXRvciBvcCkgY29uc3QKIHsKKyNp ZiBFTkFCTEUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBjb25zdCBTa0JpdG1h cCYgYml0bWFwID0gbV9jYW52YXMtPmdldERldmljZSgpLT5hY2Nlc3NCaXRtYXAoZmFsc2UpOwog ICAgIFNrQXV0b0xvY2tQaXhlbHMgbG9jayhiaXRtYXApOwogICAgIFNoYXJlZEdyYXBoaWNzQ29u dGV4dDNEKiBjb250ZXh0ID0gbV9ncHVDYW52YXMtPmNvbnRleHQoKTsKQEAgLTgyNSwxMCArODM2 LDE0IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6dXBsb2FkU29mdHdhcmVUb0hhcmR3YXJl KENvbXBvc2l0ZU9wZXJhdG9yIG9wKSBjb25zdAogICAgIG1fY2FudmFzLT5kcmF3QVJHQigwLCAw LCAwLCAwLCBTa1hmZXJtb2RlOjprQ2xlYXJfTW9kZSk7CiAgICAgbV9jYW52YXMtPnJlc3RvcmUo KTsKICAgICBtX3NvZnR3YXJlRGlydHlSZWN0LnNldFdpZHRoKDApOyAvLyBDbGVhciBkaXJ0eSBy ZWN0LgorI2Vsc2UKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyNlbmRpZgogfQogCiB2b2lk IFBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVUb1NvZnR3YXJlKCkgY29uc3QK IHsKKyNpZiBFTkFCTEUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBjb25zdCBT a0JpdG1hcCYgYml0bWFwID0gbV9jYW52YXMtPmdldERldmljZSgpLT5hY2Nlc3NCaXRtYXAodHJ1 ZSk7CiAgICAgU2tBdXRvTG9ja1BpeGVscyBsb2NrKGJpdG1hcCk7CiAgICAgaW50IHdpZHRoID0g Yml0bWFwLndpZHRoKCksIGhlaWdodCA9IGJpdG1hcC5oZWlnaHQoKTsKQEAgLTg1MCw2ICs4NjUs OSBAQCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVUb1NvZnR3YXJl KCkgY29uc3QKICAgICAgICAgfQogICAgIH0KICAgICBtX3NvZnR3YXJlRGlydHlSZWN0LnVuaXRl KEludFJlY3QoMCwgMCwgd2lkdGgsIGhlaWdodCkpOyAvLyBNYXJrIGV2ZXJ5dGhpbmcgYXMgZGly dHkuCisjZWxzZQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworI2VuZGlmCiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv c2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Nr aWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCmluZGV4IGViMDMyMjQyMWY3OTNhYjMxYzQ0MzEyMTZm M2U5NmE1MjkwYTI3ODEuLjAwNWU0ZTExM2E2MGE0Y2U5ZmVlNTExMGJiNjlmZDcxMTNmMTMzNDQg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRl eHRTa2lhLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaApAQCAtMTgzLDggKzE4MywxMSBAQCBwdWJsaWM6CiAgICAgYm9vbCBjYW52YXND bGlwQXBwbGllZCgpIGNvbnN0OwogICAgIGJvb2wgdXNlR1BVKCkgeyByZXR1cm4gbV91c2VHUFU7 IH0KICAgICB2b2lkIHNldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKFNoYXJlZEdyYXBoaWNzQ29u dGV4dDNEKiwgRHJhd2luZ0J1ZmZlciosIGNvbnN0IEludFNpemUmKTsKKyNpZiBFTkFCTEUoRU5B QkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBHTEVTMkNhbnZhcyogZ3B1Q2FudmFzKCkg Y29uc3QgeyByZXR1cm4gbV9ncHVDYW52YXMuZ2V0KCk7IH0KLQorI2Vsc2UKKyAgICBHTEVTMkNh bnZhcyogZ3B1Q2FudmFzKCkgY29uc3QgeyByZXR1cm4gMDsgfQorI2VuZGlmCiAgICAgLy8gQ2Fs bCB0aGVzZSBiZWZvcmUgbWFraW5nIGEgY2FsbCB0aGF0IG1hbmlwdWxhdGVzIHRoZSB1bmRlcmx5 aW5nCiAgICAgLy8gc2tpYTo6UGxhdGZvcm1DYW52YXMgb3IgV2ViQ29yZTo6R0xFUzJDYW52YXMK ICAgICB2b2lkIHByZXBhcmVGb3JTb2Z0d2FyZURyYXcoKSBjb25zdDsKQEAgLTIyNCw3ICsyMjcs OSBAQCBwcml2YXRlOgogICAgIEZsb2F0U2l6ZSBtX2ltYWdlUmVzYW1wbGluZ0hpbnREc3RTaXpl OwogICAgIGJvb2wgbV9kcmF3aW5nVG9JbWFnZUJ1ZmZlcjsKICAgICBib29sIG1fdXNlR1BVOwor I2lmIEVOQUJMRShFTkFCTEVfQUNDRUxFUkFURURfMkRfQ0FOVkFTKQogICAgIE93blB0cjxHTEVT MkNhbnZhcz4gbV9ncHVDYW52YXM7CisjZW5kaWYKICAgICBtdXRhYmxlIGVudW0geyBOb25lLCBT b2Z0d2FyZSwgTWl4ZWQsIEhhcmR3YXJlIH0gbV9iYWNraW5nU3RvcmVTdGF0ZTsKICAgICBtdXRh YmxlIFJlZlB0cjxUZXh0dXJlPiBtX3VwbG9hZFRleHR1cmU7CiAgICAgbXV0YWJsZSBJbnRSZWN0 IG1fc29mdHdhcmVEaXJ0eVJlY3Q7CmRpZmYgLS1naXQgYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdl TG9nIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA2ODVhYzIwMTc4YTQyNGNjMjNi MDg4NGJhZTA4ZDllM2FjOGQwZThhLi4wOTUxYjFlYjgxMGQwNzc5MjQ3ZDQ1NGU1NTA1Y2FjMzE3 NDUyOTc5IDEwMDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOS0zMCAgTU9SSVRB IEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIGJ1aWxkIGZhaWxzIHVubGVzcyBBQ0NF TEVSQVRFRF8yRF9DQU5WQVMgZGVmaW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDY5NTUKKyAgICAgICAgCisgICAgICAgIEFkZGVkIGlmZGVmIGd1 YXJkIGFyb3VuZCBTaGFyZWRHcmFwaGljc0NvbnRleHQzRC4KKworICAgICAgICAqIHNyYy9XZWJW aWV3SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpnZXRTaGFyZWRHcmFw aGljc0NvbnRleHQzRCk6CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmg6CisKIDIwMTAtMDkt MzAgIEFsZXhleSBNYXJpbmljaGV2ICA8YW1hcmluaWNoZXZAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IENocmlzIE1hcnJpbi4KZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKaW5kZXggYjQxNWJmODIwYTU4MTVhMTVmMjdmNjA5MjYzYjY0ZTI1ZTBjY2Q5Ni4uMTViMmEx MTgxMzIxZWZkZDFlZmYyZTY0ZDEzNGYxMmY3MjlmNGQ3NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5jcHAKQEAgLTg4LDcgKzg4LDYgQEAKICNpbmNsdWRlICJTZWN1cml0eU9yaWdpbi5o IgogI2luY2x1ZGUgIlNlbGVjdGlvbkNvbnRyb2xsZXIuaCIKICNpbmNsdWRlICJTZXR0aW5ncy5o IgotI2luY2x1ZGUgIlNoYXJlZEdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVkZSAiVGltZXIu aCIKICNpbmNsdWRlICJUeXBpbmdDb21tYW5kLmgiCiAjaW5jbHVkZSAiVXNlckdlc3R1cmVJbmRp Y2F0b3IuaCIKQEAgLTEzMSw2ICsxMzAsMTAgQEAKICNpbmNsdWRlICJSZW5kZXJUaGVtZS5oIgog I2VuZGlmCiAKKyNpZiBFTkFCTEUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUykKKyNpbmNs dWRlICJTaGFyZWRHcmFwaGljc0NvbnRleHQzRC5oIgorI2VuZGlmCisKIC8vIEdldCByaWQgb2Yg V1RGJ3MgcG93IGRlZmluZSBzbyB3ZSBjYW4gdXNlIHN0ZDo6cG93LgogI3VuZGVmIHBvdwogI2lu Y2x1ZGUgPGNtYXRoPiAvLyBmb3Igc3RkOjpwb3cKQEAgLTI0MjUsNiArMjQyOCw3IEBAIHZvaWQg V2ViVmlld0ltcGw6OmRvQ29tcG9zaXRlKCkKIAogU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QqIFdl YlZpZXdJbXBsOjpnZXRTaGFyZWRHcmFwaGljc0NvbnRleHQzRCgpCiB7CisjaWYgRU5BQkxFKEFD Q0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBpZiAoIW1fc2hhcmVkQ29udGV4dDNEKSB7CiAgICAg ICAgIEdyYXBoaWNzQ29udGV4dDNEOjpBdHRyaWJ1dGVzIGF0dHI7CiAgICAgICAgIE93blB0cjxH cmFwaGljc0NvbnRleHQzRD4gY29udGV4dCA9IEdyYXBoaWNzQ29udGV4dDNEOjpjcmVhdGUoYXR0 ciwgbV9wYWdlLT5jaHJvbWUoKSk7CkBAIC0yNDM0LDYgKzI0MzgsOSBAQCBTaGFyZWRHcmFwaGlj c0NvbnRleHQzRCogV2ViVmlld0ltcGw6OmdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKCkKICAg ICB9CiAKICAgICByZXR1cm4gbV9zaGFyZWRDb250ZXh0M0QuZ2V0KCk7CisjZWxzZQorICAgIHJl dHVybiAwOworI2VuZGlmCiB9CiAKIFdlYkdyYXBoaWNzQ29udGV4dDNEKiBXZWJWaWV3SW1wbDo6 Z3JhcGhpY3NDb250ZXh0M0QoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCmluZGV4IDlkYjkx NGRiMDVjODZlODNkZDE4YWVmYWNkYWE2N2FhZDEzMjkyMDMuLjk5ZDNlM2RiNTliODU3NzMyZmMz NjcxMTBlOTQ2YWQ2ZDIzOWNiMWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaAorKysgYi9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTUz OCw4ICs1MzgsOSBAQCBwcml2YXRlOgogICAgIC8vIGVhcmx5LiBUaGlzIG1lbWJlciBob2xkcyBv biB0byB0aGUgR0MzRCBpbiB0aGlzIGNhc2UuCiAgICAgT3duUHRyPFdlYkNvcmU6OkdyYXBoaWNz Q29udGV4dDNEPiBtX3RlbXBvcmFyeU9uc2NyZWVuR3JhcGhpY3NDb250ZXh0M0Q7CiAKKyNpZiBF TkFCTEUoRU5BQkxFX0FDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBSZWZQdHI8V2ViQ29yZTo6 U2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q+IG1fc2hhcmVkQ29udGV4dDNEOwotCisjZW5kaWYKICAg ICBPd25QdHI8RGV2aWNlT3JpZW50YXRpb25DbGllbnRQcm94eT4gbV9kZXZpY2VPcmllbnRhdGlv bkNsaWVudFByb3h5OwogfTsKIAo= 69422 2010-09-30 22:41:32 -0700 2010-09-30 22:47:59 -0700 Patch bug-46955-20101001144130.patch text/plain 8006 morrita ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWViZTg1NjkxMGE1NDQ3N2FiYzdmZDgyYzYwMTA5NTU1YzExYzBmYy4uZTAxNmFlMzMwNTVjZDZj NWJhNWIxNDBhMWUzMWRjMThkOWI1MDI2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0wOS0zMCAgTU9S SVRBIEhhamltZSAgPG1vcnJpdGFAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIGJ1aWxkIGZhaWxzIHVubGVzcyBB Q0NFTEVSQVRFRF8yRF9DQU5WQVMgZGVmaW5lZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY5NTUKKyAgICAgICAgCisgICAgICAgIEFkZGVkIGlmZGVm IGd1YXJkIGFyb3VuZCBTaGFyZWRHcmFwaGljc0NvbnRleHQzRC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIGp1c3QgYSBidWlsZCBmaXguCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9z a2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1D b250ZXh0U2tpYTo6flBsYXRmb3JtQ29udGV4dFNraWEpOgorICAgICAgICAoV2ViQ29yZTo6UGxh dGZvcm1Db250ZXh0U2tpYTo6c2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QpOgorICAgICAgICAo V2ViQ29yZTo6UGxhdGZvcm1Db250ZXh0U2tpYTo6dXBsb2FkU29mdHdhcmVUb0hhcmR3YXJlKToK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVU b1NvZnR3YXJlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ29udGV4dFNraWE6OmdwdUNh bnZhcyk6CisKIDIwMTAtMDktMzAgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIFdpbmRvd3MgYnVpbGQgZml4IGZvciByNjg4NTQKZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcAppbmRleCBiNDY5MzEyZmEwOThmNmI1OGNjZDVhOGQ4Y2Q0Y2ZmZDE0YTFlYzJmLi44ODcz MTRmODIyNTM0ZjFlOGYwOTcyMTRjNjA3MDNjMGY1MmE5NWE0IDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCkBAIC0z NCwxMiArMzQsMTAgQEAKIAogI2luY2x1ZGUgIkFmZmluZVRyYW5zZm9ybS5oIgogI2luY2x1ZGUg IkRyYXdpbmdCdWZmZXIuaCIKLSNpbmNsdWRlICJHTEVTMkNhbnZhcy5oIgogI2luY2x1ZGUgIkdy YXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dDNELmgiCiAjaW5jbHVk ZSAiSW1hZ2VCdWZmZXIuaCIKICNpbmNsdWRlICJOYXRpdmVJbWFnZVNraWEuaCIKLSNpbmNsdWRl ICJTaGFyZWRHcmFwaGljc0NvbnRleHQzRC5oIgogI2luY2x1ZGUgIlNraWFVdGlscy5oIgogI2lu Y2x1ZGUgIlRleHR1cmUuaCIKICNpbmNsdWRlICJUaWxpbmdEYXRhLmgiCkBAIC01Niw2ICs1NCwx MSBAQAogI2luY2x1ZGUgPHd0Zi9Pd25BcnJheVB0ci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3Iu aD4KIAorI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCisjaW5jbHVkZSAiR0xFUzJD YW52YXMuaCIKKyNpbmNsdWRlICJTaGFyZWRHcmFwaGljc0NvbnRleHQzRC5oIgorI2VuZGlmCisK IG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogZXh0ZXJuIGJvb2wgaXNQYXRoU2tpYVNhZmUoY29uc3Qg U2tNYXRyaXgmIHRyYW5zZm9ybSwgY29uc3QgU2tQYXRoJiBwYXRoKTsKQEAgLTIxNiw4ICsyMTks MTAgQEAgUGxhdGZvcm1Db250ZXh0U2tpYTo6UGxhdGZvcm1Db250ZXh0U2tpYShza2lhOjpQbGF0 Zm9ybUNhbnZhcyogY2FudmFzKQogCiBQbGF0Zm9ybUNvbnRleHRTa2lhOjp+UGxhdGZvcm1Db250 ZXh0U2tpYSgpCiB7CisjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBpZiAo bV9ncHVDYW52YXMpCiAgICAgICAgIG1fZ3B1Q2FudmFzLT5kcmF3aW5nQnVmZmVyKCktPnNldFdp bGxQdWJsaXNoQ2FsbGJhY2soMCk7CisjZW5kaWYKIH0KIAogdm9pZCBQbGF0Zm9ybUNvbnRleHRT a2lhOjpzZXRDYW52YXMoc2tpYTo6UGxhdGZvcm1DYW52YXMqIGNhbnZhcykKQEAgLTcwNSw2ICs3 MTAsNyBAQCBwcml2YXRlOgogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnNldFNoYXJlZEdy YXBoaWNzQ29udGV4dDNEKFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiBjb250ZXh0LCBEcmF3aW5n QnVmZmVyKiBkcmF3aW5nQnVmZmVyLCBjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKQogewor I2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAgICAgaWYgKGNvbnRleHQgJiYgZHJh d2luZ0J1ZmZlcikgewogICAgICAgICBtX3VzZUdQVSA9IHRydWU7CiAgICAgICAgIG1fZ3B1Q2Fu dmFzID0gbmV3IEdMRVMyQ2FudmFzKGNvbnRleHQsIGRyYXdpbmdCdWZmZXIsIHNpemUpOwpAQCAt NzE2LDYgKzcyMiw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6c2V0U2hhcmVkR3JhcGhp Y3NDb250ZXh0M0QoU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QqIGNvCiAgICAgICAgIG1fZ3B1Q2Fu dmFzLmNsZWFyKCk7CiAgICAgICAgIG1fdXNlR1BVID0gZmFsc2U7CiAgICAgfQorI2VuZGlmCiB9 CiAKIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6cHJlcGFyZUZvclNvZnR3YXJlRHJhdygpIGNv bnN0CkBAIC04MDgsNiArODE1LDcgQEAgdm9pZCBQbGF0Zm9ybUNvbnRleHRTa2lhOjptYXJrRGly dHlSZWN0KGNvbnN0IEludFJlY3QmIHJlY3QpCiAKIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6 dXBsb2FkU29mdHdhcmVUb0hhcmR3YXJlKENvbXBvc2l0ZU9wZXJhdG9yIG9wKSBjb25zdAogewor I2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAgICAgY29uc3QgU2tCaXRtYXAmIGJp dG1hcCA9IG1fY2FudmFzLT5nZXREZXZpY2UoKS0+YWNjZXNzQml0bWFwKGZhbHNlKTsKICAgICBT a0F1dG9Mb2NrUGl4ZWxzIGxvY2soYml0bWFwKTsKICAgICBTaGFyZWRHcmFwaGljc0NvbnRleHQz RCogY29udGV4dCA9IG1fZ3B1Q2FudmFzLT5jb250ZXh0KCk7CkBAIC04MjUsMTAgKzgzMywxMiBA QCB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnVwbG9hZFNvZnR3YXJlVG9IYXJkd2FyZShDb21w b3NpdGVPcGVyYXRvciBvcCkgY29uc3QKICAgICBtX2NhbnZhcy0+ZHJhd0FSR0IoMCwgMCwgMCwg MCwgU2tYZmVybW9kZTo6a0NsZWFyX01vZGUpOwogICAgIG1fY2FudmFzLT5yZXN0b3JlKCk7CiAg ICAgbV9zb2Z0d2FyZURpcnR5UmVjdC5zZXRXaWR0aCgwKTsgLy8gQ2xlYXIgZGlydHkgcmVjdC4K KyNlbmRpZgogfQogCiB2b2lkIFBsYXRmb3JtQ29udGV4dFNraWE6OnJlYWRiYWNrSGFyZHdhcmVU b1NvZnR3YXJlKCkgY29uc3QKIHsKKyNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQog ICAgIGNvbnN0IFNrQml0bWFwJiBiaXRtYXAgPSBtX2NhbnZhcy0+Z2V0RGV2aWNlKCktPmFjY2Vz c0JpdG1hcCh0cnVlKTsKICAgICBTa0F1dG9Mb2NrUGl4ZWxzIGxvY2soYml0bWFwKTsKICAgICBp bnQgd2lkdGggPSBiaXRtYXAud2lkdGgoKSwgaGVpZ2h0ID0gYml0bWFwLmhlaWdodCgpOwpAQCAt ODUwLDYgKzg2MCw3IEBAIHZvaWQgUGxhdGZvcm1Db250ZXh0U2tpYTo6cmVhZGJhY2tIYXJkd2Fy ZVRvU29mdHdhcmUoKSBjb25zdAogICAgICAgICB9CiAgICAgfQogICAgIG1fc29mdHdhcmVEaXJ0 eVJlY3QudW5pdGUoSW50UmVjdCgwLCAwLCB3aWR0aCwgaGVpZ2h0KSk7IC8vIE1hcmsgZXZlcnl0 aGluZyBhcyBkaXJ0eS4KKyNlbmRpZgogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tp YS5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEu aAppbmRleCBlYjAzMjI0MjFmNzkzYWIzMWM0NDMxMjE2ZjNlOTZhNTI5MGEyNzgxLi43MWQ5NmMy YWMxZTlhYWVhNTE4MmNjNzI1OTE2MWFhMDlmYWJhN2FiIDEwMDY0NAotLS0gYS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5oCisrKyBiL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgKQEAgLTE4Myw4ICsx ODMsMTEgQEAgcHVibGljOgogICAgIGJvb2wgY2FudmFzQ2xpcEFwcGxpZWQoKSBjb25zdDsKICAg ICBib29sIHVzZUdQVSgpIHsgcmV0dXJuIG1fdXNlR1BVOyB9CiAgICAgdm9pZCBzZXRTaGFyZWRH cmFwaGljc0NvbnRleHQzRChTaGFyZWRHcmFwaGljc0NvbnRleHQzRCosIERyYXdpbmdCdWZmZXIq LCBjb25zdCBJbnRTaXplJik7CisjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAg ICBHTEVTMkNhbnZhcyogZ3B1Q2FudmFzKCkgY29uc3QgeyByZXR1cm4gbV9ncHVDYW52YXMuZ2V0 KCk7IH0KLQorI2Vsc2UKKyAgICBHTEVTMkNhbnZhcyogZ3B1Q2FudmFzKCkgY29uc3QgeyByZXR1 cm4gMDsgfQorI2VuZGlmCiAgICAgLy8gQ2FsbCB0aGVzZSBiZWZvcmUgbWFraW5nIGEgY2FsbCB0 aGF0IG1hbmlwdWxhdGVzIHRoZSB1bmRlcmx5aW5nCiAgICAgLy8gc2tpYTo6UGxhdGZvcm1DYW52 YXMgb3IgV2ViQ29yZTo6R0xFUzJDYW52YXMKICAgICB2b2lkIHByZXBhcmVGb3JTb2Z0d2FyZURy YXcoKSBjb25zdDsKQEAgLTIyNCw3ICsyMjcsOSBAQCBwcml2YXRlOgogICAgIEZsb2F0U2l6ZSBt X2ltYWdlUmVzYW1wbGluZ0hpbnREc3RTaXplOwogICAgIGJvb2wgbV9kcmF3aW5nVG9JbWFnZUJ1 ZmZlcjsKICAgICBib29sIG1fdXNlR1BVOworI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5W QVMpCiAgICAgT3duUHRyPEdMRVMyQ2FudmFzPiBtX2dwdUNhbnZhczsKKyNlbmRpZgogICAgIG11 dGFibGUgZW51bSB7IE5vbmUsIFNvZnR3YXJlLCBNaXhlZCwgSGFyZHdhcmUgfSBtX2JhY2tpbmdT dG9yZVN0YXRlOwogICAgIG11dGFibGUgUmVmUHRyPFRleHR1cmU+IG1fdXBsb2FkVGV4dHVyZTsK ICAgICBtdXRhYmxlIEludFJlY3QgbV9zb2Z0d2FyZURpcnR5UmVjdDsKZGlmZiAtLWdpdCBhL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDY4NWFjMjAxNzhhNDI0Y2MyM2IwODg0YmFlMDhkOWUzYWM4ZDBlOGEuLjA5NTFiMWViODEwZDA3 NzkyNDdkNDU0ZTU1MDVjYWMzMTc0NTI5NzkgMTAwNjQ0Ci0tLSBhL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIGIvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDEwLTA5LTMwICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtDaHJvbWl1bV0gYnVp bGQgZmFpbHMgdW5sZXNzIEFDQ0VMRVJBVEVEXzJEX0NBTlZBUyBkZWZpbmVkCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njk1NQorICAgICAgICAKKyAg ICAgICAgQWRkZWQgaWZkZWYgZ3VhcmQgYXJvdW5kIFNoYXJlZEdyYXBoaWNzQ29udGV4dDNELgor CisgICAgICAgICogc3JjL1dlYlZpZXdJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVmll d0ltcGw6OmdldFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKToKKyAgICAgICAgKiBzcmMvV2ViVmll d0ltcGwuaDoKKwogMjAxMC0wOS0zMCAgQWxleGV5IE1hcmluaWNoZXYgIDxhbWFyaW5pY2hldkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ2hyaXMgTWFycmluLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAgYi9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCBiNDE1YmY4MjBhNTgxNWExNWYyN2Y2MDkyNjNi NjRlMjVlMGNjZDk2Li5mZDdkZDNhN2I4MTc2ZTY1MWU1ZjZkYTNlNzk0MTk1MDUyYTMyMmI5IDEw MDY0NAotLS0gYS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcApAQCAtODgsNyArODgsNiBAQAogI2luY2x1 ZGUgIlNlY3VyaXR5T3JpZ2luLmgiCiAjaW5jbHVkZSAiU2VsZWN0aW9uQ29udHJvbGxlci5oIgog I2luY2x1ZGUgIlNldHRpbmdzLmgiCi0jaW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0M0Qu aCIKICNpbmNsdWRlICJUaW1lci5oIgogI2luY2x1ZGUgIlR5cGluZ0NvbW1hbmQuaCIKICNpbmNs dWRlICJVc2VyR2VzdHVyZUluZGljYXRvci5oIgpAQCAtMTMxLDYgKzEzMCwxMCBAQAogI2luY2x1 ZGUgIlJlbmRlclRoZW1lLmgiCiAjZW5kaWYKIAorI2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9D QU5WQVMpCisjaW5jbHVkZSAiU2hhcmVkR3JhcGhpY3NDb250ZXh0M0QuaCIKKyNlbmRpZgorCiAv LyBHZXQgcmlkIG9mIFdURidzIHBvdyBkZWZpbmUgc28gd2UgY2FuIHVzZSBzdGQ6OnBvdy4KICN1 bmRlZiBwb3cKICNpbmNsdWRlIDxjbWF0aD4gLy8gZm9yIHN0ZDo6cG93CkBAIC0yNDI1LDYgKzI0 MjgsNyBAQCB2b2lkIFdlYlZpZXdJbXBsOjpkb0NvbXBvc2l0ZSgpCiAKIFNoYXJlZEdyYXBoaWNz Q29udGV4dDNEKiBXZWJWaWV3SW1wbDo6Z2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoKQogewor I2lmIEVOQUJMRShBQ0NFTEVSQVRFRF8yRF9DQU5WQVMpCiAgICAgaWYgKCFtX3NoYXJlZENvbnRl eHQzRCkgewogICAgICAgICBHcmFwaGljc0NvbnRleHQzRDo6QXR0cmlidXRlcyBhdHRyOwogICAg ICAgICBPd25QdHI8R3JhcGhpY3NDb250ZXh0M0Q+IGNvbnRleHQgPSBHcmFwaGljc0NvbnRleHQz RDo6Y3JlYXRlKGF0dHIsIG1fcGFnZS0+Y2hyb21lKCkpOwpAQCAtMjQzNCw2ICsyNDM4LDkgQEAg U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QqIFdlYlZpZXdJbXBsOjpnZXRTaGFyZWRHcmFwaGljc0Nv bnRleHQzRCgpCiAgICAgfQogCiAgICAgcmV0dXJuIG1fc2hhcmVkQ29udGV4dDNELmdldCgpOwor I2Vsc2UKKyAgICByZXR1cm4gMDsKKyNlbmRpZgogfQogCiBXZWJHcmFwaGljc0NvbnRleHQzRCog V2ViVmlld0ltcGw6OmdyYXBoaWNzQ29udGV4dDNEKCkKZGlmZiAtLWdpdCBhL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaCBiL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwu aAppbmRleCA5ZGI5MTRkYjA1Yzg2ZTgzZGQxOGFlZmFjZGFhNjdhYWQxMzI5MjAzLi45YzIxZTQ5 MjdjM2E1ODVhOWZiZmZjNTcyYTNiZGMyZjZlN2ZhZGYwIDEwMDY0NAotLS0gYS9XZWJLaXQvY2hy b21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKKysrIGIvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5oCkBAIC01MzgsOCArNTM4LDkgQEAgcHJpdmF0ZToKICAgICAvLyBlYXJseS4gVGhpcyBt ZW1iZXIgaG9sZHMgb24gdG8gdGhlIEdDM0QgaW4gdGhpcyBjYXNlLgogICAgIE93blB0cjxXZWJD b3JlOjpHcmFwaGljc0NvbnRleHQzRD4gbV90ZW1wb3JhcnlPbnNjcmVlbkdyYXBoaWNzQ29udGV4 dDNEOwogCisjaWYgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKICAgICBSZWZQdHI8V2Vi Q29yZTo6U2hhcmVkR3JhcGhpY3NDb250ZXh0M0Q+IG1fc2hhcmVkQ29udGV4dDNEOwotCisjZW5k aWYKICAgICBPd25QdHI8RGV2aWNlT3JpZW50YXRpb25DbGllbnRQcm94eT4gbV9kZXZpY2VPcmll bnRhdGlvbkNsaWVudFByb3h5OwogfTsKIAo=