73817 2011-12-05 03:41:35 -0800 [TexMap][QT] TexMap does not draw the border of media and webgl elements. 2011-12-06 02:47:34 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 dongseong.hwang webkit-unassigned igor.oliveira noam webkit.review.bot oldest_to_newest 515015 0 dongseong.hwang 2011-12-05 03:41:35 -0800 TexMap does not draw the border of media and webgl elements. 515016 1 117865 dongseong.hwang 2011-12-05 03:45:19 -0800 Created attachment 117865 patch 515099 2 117865 noam 2011-12-05 08:22:54 -0800 Comment on attachment 117865 patch View in context: https://bugs.webkit.org/attachment.cgi?id=117865&action=review > Source/WebCore/ChangeLog:9 > + GraphicsContext3D only draws the content, not CSS box border and TexMap only > + composited the platformLayer of media and webgl elements. > + It causes that TexMap did not render the border of following layout test. > + LayoutTests/compositing/webgl/webgl-reflection.html Let's rewrite this... "GraphicsContext3D only draws the content of the WebGL canvas, not the additional CSS such as the borders. TextureMapper should render the content of a media/webgl layer before drawing the actual canvas." This makes LayoutTests/compositing/webgl/webgl-reflection.html work. > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:318 > + if (m_currentContent.contentType == MediaContentType && !needsReset) > + continue; Doesn't seem correct. This means that we ignore partial-updates for WebGL/media layers. 515103 3 noam 2011-12-05 08:38:28 -0800 > > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:318 > > + if (m_currentContent.contentType == MediaContentType && !needsReset) > > + continue; > I think the real problem this tries to solve is that we treat setNeedsDisplay and setContentsNeedsDisplay differently. We should change that. 515501 4 117955 dongseong.hwang 2011-12-05 16:52:48 -0800 Created attachment 117955 patch 515504 5 dongseong.hwang 2011-12-05 16:54:33 -0800 I was afraid about ignoring partial-updates for WebGL/media layers, but I did not know how to solve. Your feedback is what I need. 515508 6 117958 dongseong.hwang 2011-12-05 17:02:03 -0800 Created attachment 117958 patch 515525 7 117955 noam 2011-12-05 17:20:20 -0800 Comment on attachment 117955 patch View in context: https://bugs.webkit.org/attachment.cgi?id=117955&action=review > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:72 > + m_pendingContent.needsDisplayContents = true; contentsNeedDisplay instead of needsDisplayContents > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:303 > + } This is incorrect. If content type is not media, we shouldn't use contentsNeedsDisplay at all! > Source/WebCore/platform/graphics/texmap/TextureMapperNode.h:123 > + bool needsDisplayContents; contentsNeedDisplay 515527 8 117958 noam 2011-12-05 17:22:24 -0800 Comment on attachment 117958 patch View in context: https://bugs.webkit.org/attachment.cgi?id=117958&action=review > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:307 > + if (m_currentContent.contentType == MediaContentType && !m_currentContent.needsDisplay) { > + m_currentContent.needsDisplayContents = false; > return; > + } > + if (m_currentContent.contentType != MediaContentType) { > + m_currentContent.needsDisplay = m_currentContent.needsDisplayContents; > + m_currentContent.needsDisplayContents = false; > + } This is very hard to read. I think you want a temporary variable here instead of modifying m_currentContent.needsDisplay. > Source/WebCore/platform/graphics/texmap/TextureMapperNode.h:123 > + bool needsDisplayContents; contentsNeedsDisplay 515548 9 117964 dongseong.hwang 2011-12-05 17:45:10 -0800 Created attachment 117964 patch 515552 10 dongseong.hwang 2011-12-05 17:49:38 -0800 Thanks for this declaration. "If content type is not media, we shouldn't use contentsNeedsDisplay at all!" 515558 11 117964 noam 2011-12-05 17:58:12 -0800 Comment on attachment 117964 patch View in context: https://bugs.webkit.org/attachment.cgi?id=117964&action=review You can probably get the same result without redundant updates by getting rid of some code :) > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:73 > + m_pendingContent.needsDisplay = true; You can probably remove these two lines; otherwise you're causing unnecessary updates. > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:301 > - if (m_currentContent.contentType == MediaContentType) > + if (m_currentContent.contentType == MediaContentType && !m_currentContent.needsDisplay) > return; The code would probably work just the same if you remove these lines from the code altogether. 515573 12 117974 dongseong.hwang 2011-12-05 18:20:42 -0800 Created attachment 117974 patch 515575 13 noam 2011-12-05 18:24:54 -0800 (In reply to comment #11) > (From update of attachment 117964 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=117964&action=review > > You can probably get the same result without redundant updates by getting rid of some code :) > > > Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp:73 > > + m_pendingContent.needsDisplay = true; > > You can probably remove these two lines; otherwise you're causing unnecessary updates. > > > Source/WebCore/platform/graphics/texmap/TextureMapperNode.cpp:301 > > - if (m_currentContent.contentType == MediaContentType) > > + if (m_currentContent.contentType == MediaContentType && !m_currentContent.needsDisplay) > > return; > > The code would probably work just the same if you remove these lines from the code altogether. Correction: You do need the first one, because setContentsNeedsDisplay is also called for images. So, a blend between the two last patches should work (include the stuff around line 73, remove the stuff around 301). 515600 14 117980 dongseong.hwang 2011-12-05 19:33:38 -0800 Created attachment 117980 patch 515601 15 dongseong.hwang 2011-12-05 19:38:06 -0800 I thought image and 2d canvas would have problem, so I tested 2d canvas. However, 2d canvas was rendered properly, so I thought there is something that you know but I don't know. and patched it. After this patch, I tested 2d canvas again, and there is setContentsToCanvas call every frame, and it cause 2d canvas is rendered every frame. 515763 16 117980 webkit.review.bot 2011-12-06 02:47:29 -0800 Comment on attachment 117980 patch Clearing flags on attachment: 117980 Committed r102113: <http://trac.webkit.org/changeset/102113> 515764 17 webkit.review.bot 2011-12-06 02:47:34 -0800 All reviewed patches have been landed. Closing bug. 117865 2011-12-05 03:45:19 -0800 2011-12-05 16:52:48 -0800 patch 0001-TexMap-QT-Draw-the-border-of-media-and-webgl-element.patch text/plain 5699 dongseong.hwang RnJvbSBhNjVlMzc4MDI4NjQ0NDY4ZjNmZGU3YzVjODVjYTMzYjBkNDllZDc5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVyIG9mIG1lZGlhIGFuZCB3ZWJnbCBlbGVtZW50 cyBpbgogVGV4TWFwLiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM4 MTcKCkdyYXBoaWNzQ29udGV4dDNEIG9ubHkgZHJhd3MgdGhlIGNvbnRlbnQsIG5vdCBDU1MgYm94 IGJvcmRlciBhbmQgVGV4TWFwIG9ubHkKY29tcG9zaXRlZCB0aGUgcGxhdGZvcm1MYXllciBvZiBt ZWRpYSBhbmQgd2ViZ2wgZWxlbWVudHMuCkl0IGNhdXNlcyB0aGF0IFRleE1hcCBkaWQgbm90IHJl bmRlciB0aGUgYm9yZGVyIG9mIGZvbGxvd2luZyBsYXlvdXQgdGVzdC4KTGF5b3V0VGVzdHMvY29t cG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sCi0tLQogU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsrKysrKysrKysrCiAu Li4vcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcCB8ICAgMjcg KysrKysrKysrLS0tLS0tLS0tLQogMiBmaWxlcyBjaGFuZ2VkLCAyOSBpbnNlcnRpb25zKCspLCAx NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmFjZGUzYy4uNTI3YjQ1ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSw1ICsxLDIxIEBACiAyMDExLTEyLTA1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxh QGNvbXBhbnkxMDAubmV0PgogCisgICAgICAgIFtUZXhNYXBdW1FUXSBEcmF3IHRoZSBib3JkZXIg b2YgbWVkaWEgYW5kIHdlYmdsIGVsZW1lbnRzIGluIFRleE1hcC4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczODE3CisKKyAgICAgICAgR3JhcGhpY3ND b250ZXh0M0Qgb25seSBkcmF3cyB0aGUgY29udGVudCwgbm90IENTUyBib3ggYm9yZGVyIGFuZCBU ZXhNYXAgb25seQorICAgICAgICBjb21wb3NpdGVkIHRoZSBwbGF0Zm9ybUxheWVyIG9mIG1lZGlh IGFuZCB3ZWJnbCBlbGVtZW50cy4KKyAgICAgICAgSXQgY2F1c2VzIHRoYXQgVGV4TWFwIGRpZCBu b3QgcmVuZGVyIHRoZSBib3JkZXIgb2YgZm9sbG93aW5nIGxheW91dCB0ZXN0LgorICAgICAgICBM YXlvdXRUZXN0cy9jb21wb3NpdGluZy93ZWJnbC93ZWJnbC1yZWZsZWN0aW9uLmh0bWwKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpU ZXh0dXJlTWFwcGVyTm9kZTo6cmVuZGVyQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpUZXh0 dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToKKworMjAxMS0xMi0wNSAgSHVhbmcgRG9uZ3N1bmcg IDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4KKwogICAgICAgICBbUXRdIFJlbW92ZSByZWR1bmRh bnQgbV9nbFdpZGdldC0+bWFrZUN1cnJlbnQoKSBjYWxscyBpbiBHcmFwaGljc0NvbnRleHQzRFF0 LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzM4MTQK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKaW5kZXggNGQyMTRkZi4uMTU5MDFkMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBw ZXJOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlck5vZGUuY3BwCkBAIC0yOTcsOSArMjk3LDYgQEAgdm9pZCBUZXh0dXJlTWFw cGVyTm9kZTo6cmVuZGVyQ29udGVudChUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyLCBHcmFw aGljc0xheWUKICAgICBpZiAoIXRleHR1cmVNYXBwZXIpCiAgICAgICAgIHJldHVybjsKIAotICAg IGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUpCi0g ICAgICAgIHJldHVybjsKLQogICAgIC8vIEZJWE1FOiBBZGQgZGlyZWN0bHkgY29tcG9zaXRlZCBp bWFnZXMuCiAgICAgRmxvYXRSZWN0IGRpcnR5UmVjdCA9IG1fY3VycmVudENvbnRlbnQubmVlZHNE aXNwbGF5ID8gZW50aXJlUmVjdCgpIDogbV9jdXJyZW50Q29udGVudC5uZWVkc0Rpc3BsYXlSZWN0 OwogCkBAIC0zMTEsMTEgKzMwOCwxNCBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpyZW5kZXJD b250ZW50KFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIsIEdyYXBoaWNzTGF5ZQogICAgICAg ICBSZWZQdHI8Qml0bWFwVGV4dHVyZT4mIHRleHR1cmUgPSB0aWxlLnRleHR1cmU7CiAgICAgICAg IEludFNpemUgdGlsZVNpemUgPSBlbmNsb3NpbmdJbnRSZWN0KHRpbGUucmVjdCkuc2l6ZSgpOwog Ci0gICAgICAgIGlmICh0aWxlLm5lZWRzUmVzZXQgfHwgdGV4dHVyZS0+Y29udGVudFNpemUoKSAh PSB0aWxlU2l6ZSB8fCAhdGV4dHVyZS0+aXNWYWxpZCgpKSB7CisgICAgICAgIGJvb2wgbmVlZHNS ZXNldCA9IHRpbGUubmVlZHNSZXNldCB8fCB0ZXh0dXJlLT5jb250ZW50U2l6ZSgpICE9IHRpbGVT aXplIHx8ICF0ZXh0dXJlLT5pc1ZhbGlkKCk7CisgICAgICAgIGlmIChuZWVkc1Jlc2V0KSB7CiAg ICAgICAgICAgICB0aWxlLm5lZWRzUmVzZXQgPSBmYWxzZTsKICAgICAgICAgICAgIHRleHR1cmUt PnJlc2V0KHRpbGVTaXplLCBtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IERpcmVjdElt YWdlQ29udGVudFR5cGUgPyBmYWxzZSA6IG1fc3RhdGUuY29udGVudHNPcGFxdWUpOwogICAgICAg ICAgICAgcmVjdCA9IHRpbGUucmVjdDsKICAgICAgICAgfQorICAgICAgICBpZiAobV9jdXJyZW50 Q29udGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlICYmICFuZWVkc1Jlc2V0KQor ICAgICAgICAgICAgY29udGludWU7CiAKICAgICAgICAgSW50UmVjdCBjb250ZW50UmVjdCA9IGVu Y2xvc2luZ0ludFJlY3QodGlsZS5yZWN0KTsKICAgICAgICAgY29udGVudFJlY3QuaW50ZXJzZWN0 KGVuY2xvc2luZ0ludFJlY3QocmVjdCkpOwpAQCAtMzg0LDE2ICszODQsNiBAQCB2b2lkIFRleHR1 cmVNYXBwZXJOb2RlOjpwYWludFNlbGYoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYg b3B0aW9ucykKICAgICBmbG9hdCBvcGFjaXR5ID0gb3B0aW9ucy5pc1N1cmZhY2UgPyAxIDogb3B0 aW9ucy5vcGFjaXR5OwogICAgIEZsb2F0UmVjdCB0YXJnZXRSZWN0ID0gdGhpcy0+dGFyZ2V0UmVj dCgpOwogCi0gICAgaWYgKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gTWVkaWFDb250 ZW50VHlwZSAmJiBtX2N1cnJlbnRDb250ZW50Lm1lZGlhKSB7Ci0gICAgICAgIGlmIChtX3N0YXRl LnJlcGxpY2FMYXllciAmJiAhb3B0aW9ucy5pc1N1cmZhY2UpCi0gICAgICAgICAgICBtX2N1cnJl bnRDb250ZW50Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBw ZXIsIHRhcmdldFJlY3QsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeChtX3RyYW5zZm9ybXMudGFyZ2V0 KS5tdWx0aXBseShtX3N0YXRlLnJlcGxpY2FMYXllci0+bV90cmFuc2Zvcm1zLmxvY2FsKSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9w YWNpdHkgKiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9vcGFjaXR5LAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVwbGljYU1hc2tUZXh0 dXJlID8gcmVwbGljYU1hc2tUZXh0dXJlLmdldCgpIDogbWFza1RleHR1cmUuZ2V0KCkpOwotICAg ICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25z LnRleHR1cmVNYXBwZXIsIHRhcmdldFJlY3QsIG1fdHJhbnNmb3Jtcy50YXJnZXQsIG9wYWNpdHks IG9wdGlvbnMuaXNTdXJmYWNlID8gMCA6IG1hc2tUZXh0dXJlLmdldCgpKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLQogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIFZlY3RvcjxF eHRlcm5hbGx5TWFuYWdlZFRpbGU+IHRpbGVzVG9QYWludDsKIApAQCAtNDQ3LDYgKzQzNywxNSBA QCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYoY29uc3QgVGV4dHVyZU1hcHBlclBh aW50T3B0aW9ucyYgb3B0aW9ucykKICAgICAgICAgY29uc3QgRmxvYXRSZWN0IHJlY3QgPSB0YXJn ZXRSZWN0Rm9yVGlsZVJlY3QodGFyZ2V0UmVjdCwgbV9vd25lZFRpbGVzW2ldLnJlY3QpOwogICAg ICAgICBvcHRpb25zLnRleHR1cmVNYXBwZXItPmRyYXdUZXh0dXJlKCp0ZXh0dXJlLCByZWN0LCBt X3RyYW5zZm9ybXMudGFyZ2V0LCBvcGFjaXR5LCBvcHRpb25zLmlzU3VyZmFjZSA/IDAgOiBtYXNr VGV4dHVyZS5nZXQoKSk7CiAgICAgfQorCisgICAgaWYgKG1fY3VycmVudENvbnRlbnQuY29udGVu dFR5cGUgPT0gTWVkaWFDb250ZW50VHlwZSAmJiBtX2N1cnJlbnRDb250ZW50Lm1lZGlhKSB7Cisg ICAgICAgIGlmIChtX3N0YXRlLnJlcGxpY2FMYXllciAmJiAhb3B0aW9ucy5pc1N1cmZhY2UpCisg ICAgICAgICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihv cHRpb25zLnRleHR1cmVNYXBwZXIsIHRhcmdldFJlY3QsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeCht X3RyYW5zZm9ybXMudGFyZ2V0KS5tdWx0aXBseShtX3N0YXRlLnJlcGxpY2FMYXllci0+bV90cmFu c2Zvcm1zLmxvY2FsKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG9wYWNpdHkgKiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9vcGFjaXR5 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmVwbGljYU1hc2tUZXh0dXJlID8gcmVwbGljYU1hc2tUZXh0dXJlLmdldCgpIDogbWFza1Rl eHR1cmUuZ2V0KCkpOworICAgICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhLT5wYWludFRvVGV4 dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIsIHRhcmdldFJlY3QsIG1fdHJhbnNmb3Jt cy50YXJnZXQsIG9wYWNpdHksIG9wdGlvbnMuaXNTdXJmYWNlID8gMCA6IG1hc2tUZXh0dXJlLmdl dCgpKTsKKyAgICB9CiB9CiAKIGludCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcGFyZUdyYXBoaWNz TGF5ZXJzWlZhbHVlKGNvbnN0IHZvaWQqIGEsIGNvbnN0IHZvaWQqIGIpCi0tIAoxLjcuNS40Cgo= 117955 2011-12-05 16:52:48 -0800 2011-12-05 17:20:20 -0800 patch 0001-TexMap-QT-Draw-the-borders-of-media-and-webgl-elemen.patch text/plain 8683 dongseong.hwang RnJvbSA3NDVmNTI2YjJiMGQ4ZTU2ZDg3YmYwYzQ1NGFiMTlmODA3MzA5NmFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVu dHMgaW4KIFRleE1hcC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz ODE3CgpHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250ZW50IG9mIHRoZSBXZWJH TCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbApDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4 dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRoZSBjb250ZW50IG9mIGEKbWVkaWEvd2ViZ2wgbGF5 ZXIgYmVmb3JlIGRyYXdpbmcgdGhlIGFjdHVhbCBjYW52YXMuClRoaXMgbWFrZXMgTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE2ICsr KysrKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy LmNwcCB8ICAgIDggKysrKysKIC4uLi9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXIuaCAgIHwgICAgMiArLQogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyTm9kZS5jcHAgfCAgIDI4ICsrKysrKysrKystLS0tLS0tLS0KIC4uLi9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaCAgIHwgICAgMiArCiA1IGZpbGVz IGNoYW5nZWQsIDQyIGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRl eCBiYWNkZTNjLi41MjdiNDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEgQEAKIDIwMTEtMTIt MDUgIEh1YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKKyAgICAgICAg W1RleE1hcF1bUVRdIERyYXcgdGhlIGJvcmRlciBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVudHMg aW4gVGV4TWFwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzM4MTcKKworICAgICAgICBHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250 ZW50LCBub3QgQ1NTIGJveCBib3JkZXIgYW5kIFRleE1hcCBvbmx5CisgICAgICAgIGNvbXBvc2l0 ZWQgdGhlIHBsYXRmb3JtTGF5ZXIgb2YgbWVkaWEgYW5kIHdlYmdsIGVsZW1lbnRzLgorICAgICAg ICBJdCBjYXVzZXMgdGhhdCBUZXhNYXAgZGlkIG5vdCByZW5kZXIgdGhlIGJvcmRlciBvZiBmb2xs b3dpbmcgbGF5b3V0IHRlc3QuCisgICAgICAgIExheW91dFRlc3RzL2NvbXBvc2l0aW5nL3dlYmds L3dlYmdsLXJlZmxlY3Rpb24uaHRtbAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJO b2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpyZW5kZXJDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYpOgor CisyMDExLTEyLTA1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0Pgor CiAgICAgICAgIFtRdF0gUmVtb3ZlIHJlZHVuZGFudCBtX2dsV2lkZ2V0LT5tYWtlQ3VycmVudCgp IGNhbGxzIGluIEdyYXBoaWNzQ29udGV4dDNEUXQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MzgxNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJU ZXh0dXJlTWFwcGVyLmNwcAppbmRleCAzMjBlMzE0Li5lZTJiNGIwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9H cmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTY3LDYgKzY3LDE0IEBAIHZvaWQgR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldE5lZWRzRGlzcGxheSgpCiAKIC8qIFxyZWltcCAo R3JhcGhpY3NMYXllci5oKQogKi8KK3ZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNl dENvbnRlbnRzTmVlZHNEaXNwbGF5KCkKK3sKKyAgICBtX3BlbmRpbmdDb250ZW50Lm5lZWRzRGlz cGxheUNvbnRlbnRzID0gdHJ1ZTsKKyAgICBub3RpZnlDaGFuZ2UoVGV4dHVyZU1hcHBlck5vZGU6 OkRpc3BsYXlDaGFuZ2UpOworfQorCisvKiBccmVpbXAgKEdyYXBoaWNzTGF5ZXIuaCkKKyovCiB2 b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29u c3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIGlmIChtX3BlbmRpbmdDb250ZW50Lm5lZWRzRGlz cGxheSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKaW5kZXggOTQ0N2Yx MS4uZWJiOWI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAg LTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogCiAgICAgLy8gcmVpbXBzIGZyb20gR3JhcGhpY3NMYXll ci5oCiAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheSgpOwotICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c05lZWRzRGlzcGxheSgpIHsgc2V0TmVlZHNEaXNwbGF5KCk7IH07CisgICAg dmlydHVhbCB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCk7CiAgICAgdmlydHVhbCB2b2lk IHNldE5lZWRzRGlzcGxheUluUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZv aWQgc2V0UGFyZW50KEdyYXBoaWNzTGF5ZXIqIGxheWVyKTsKICAgICB2aXJ0dWFsIGJvb2wgc2V0 Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5jcHAKaW5kZXggNGQyMTRkZi4uMTM3OWRlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu Y3BwCkBAIC0yOTcsOCArMjk3LDEwIEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnJlbmRlckNv bnRlbnQoVGV4dHVyZU1hcHBlciogdGV4dHVyZU1hcHBlciwgR3JhcGhpY3NMYXllCiAgICAgaWYg KCF0ZXh0dXJlTWFwcGVyKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAobV9jdXJyZW50Q29u dGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlKQotICAgICAgICByZXR1cm47Cisg ICAgaWYgKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgIT0gTWVkaWFDb250ZW50VHlwZSkg eworICAgICAgICBtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheSA9IG1fY3VycmVudENvbnRl bnQubmVlZHNEaXNwbGF5Q29udGVudHM7CisgICAgICAgIG1fY3VycmVudENvbnRlbnQubmVlZHNE aXNwbGF5Q29udGVudHMgPSBmYWxzZTsKKyAgICB9CiAKICAgICAvLyBGSVhNRTogQWRkIGRpcmVj dGx5IGNvbXBvc2l0ZWQgaW1hZ2VzLgogICAgIEZsb2F0UmVjdCBkaXJ0eVJlY3QgPSBtX2N1cnJl bnRDb250ZW50Lm5lZWRzRGlzcGxheSA/IGVudGlyZVJlY3QoKSA6IG1fY3VycmVudENvbnRlbnQu bmVlZHNEaXNwbGF5UmVjdDsKQEAgLTM4NCwxNiArMzg2LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVy Tm9kZTo6cGFpbnRTZWxmKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMp CiAgICAgZmxvYXQgb3BhY2l0eSA9IG9wdGlvbnMuaXNTdXJmYWNlID8gMSA6IG9wdGlvbnMub3Bh Y2l0eTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0UmVjdCA9IHRoaXMtPnRhcmdldFJlY3QoKTsKIAot ICAgIGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUg JiYgbV9jdXJyZW50Q29udGVudC5tZWRpYSkgewotICAgICAgICBpZiAobV9zdGF0ZS5yZXBsaWNh TGF5ZXIgJiYgIW9wdGlvbnMuaXNTdXJmYWNlKQotICAgICAgICAgICAgbV9jdXJyZW50Q29udGVu dC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJn ZXRSZWN0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXgobV90cmFuc2Zvcm1zLnRhcmdldCkubXVsdGlw bHkobV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fdHJhbnNmb3Jtcy5sb2NhbCksCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcGFjaXR5ICog bV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fb3BhY2l0eSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcGxpY2FNYXNrVGV4dHVyZSA/IHJl cGxpY2FNYXNrVGV4dHVyZS5nZXQoKSA6IG1hc2tUZXh0dXJlLmdldCgpKTsKLSAgICAgICAgbV9j dXJyZW50Q29udGVudC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJl TWFwcGVyLCB0YXJnZXRSZWN0LCBtX3RyYW5zZm9ybXMudGFyZ2V0LCBvcGFjaXR5LCBvcHRpb25z LmlzU3VyZmFjZSA/IDAgOiBtYXNrVGV4dHVyZS5nZXQoKSk7Ci0gICAgICAgIHJldHVybjsKLSAg ICB9Ci0KICNpZiBVU0UoVElMRURfQkFDS0lOR19TVE9SRSkKICAgICBWZWN0b3I8RXh0ZXJuYWxs eU1hbmFnZWRUaWxlPiB0aWxlc1RvUGFpbnQ7CiAKQEAgLTQ0Nyw2ICs0MzksMTUgQEAgdm9pZCBU ZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKGNvbnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlv bnMmIG9wdGlvbnMpCiAgICAgICAgIGNvbnN0IEZsb2F0UmVjdCByZWN0ID0gdGFyZ2V0UmVjdEZv clRpbGVSZWN0KHRhcmdldFJlY3QsIG1fb3duZWRUaWxlc1tpXS5yZWN0KTsKICAgICAgICAgb3B0 aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3VGV4dHVyZSgqdGV4dHVyZSwgcmVjdCwgbV90cmFuc2Zv cm1zLnRhcmdldCwgb3BhY2l0eSwgb3B0aW9ucy5pc1N1cmZhY2UgPyAwIDogbWFza1RleHR1cmUu Z2V0KCkpOwogICAgIH0KKworICAgIGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09 IE1lZGlhQ29udGVudFR5cGUgJiYgbV9jdXJyZW50Q29udGVudC5tZWRpYSkgeworICAgICAgICBp ZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgIW9wdGlvbnMuaXNTdXJmYWNlKQorICAgICAgICAg ICAgbV9jdXJyZW50Q29udGVudC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50 ZXh0dXJlTWFwcGVyLCB0YXJnZXRSZWN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXgobV90cmFuc2Zv cm1zLnRhcmdldCkubXVsdGlwbHkobV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fdHJhbnNmb3Jtcy5s b2NhbCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBvcGFjaXR5ICogbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fb3BhY2l0eSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlcGxp Y2FNYXNrVGV4dHVyZSA/IHJlcGxpY2FNYXNrVGV4dHVyZS5nZXQoKSA6IG1hc2tUZXh0dXJlLmdl dCgpKTsKKyAgICAgICAgbV9jdXJyZW50Q29udGVudC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBw ZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJnZXRSZWN0LCBtX3RyYW5zZm9ybXMudGFyZ2V0 LCBvcGFjaXR5LCBvcHRpb25zLmlzU3VyZmFjZSA/IDAgOiBtYXNrVGV4dHVyZS5nZXQoKSk7Cisg ICAgfQogfQogCiBpbnQgVGV4dHVyZU1hcHBlck5vZGU6OmNvbXBhcmVHcmFwaGljc0xheWVyc1pW YWx1ZShjb25zdCB2b2lkKiBhLCBjb25zdCB2b2lkKiBiKQpAQCAtNjkyLDcgKzY5Myw3IEBAIHZv aWQgVGV4dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3NpdGluZ1N0YXRlU2VsZihHcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlciogZ3JhCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAg c3dhcENvbnRlbnRzQnVmZmVycygpOwogI2VuZGlmCi0gICAgaWYgKGNoYW5nZU1hc2sgPT0gTm9D aGFuZ2VzICYmIGdyYXBoaWNzTGF5ZXItPm1fYW5pbWF0aW9ucy5pc0VtcHR5KCkgJiYgcGVuZGlu Z0NvbnRlbnQubmVlZHNEaXNwbGF5UmVjdC5pc0VtcHR5KCkgJiYgIXBlbmRpbmdDb250ZW50Lm5l ZWRzRGlzcGxheSkKKyAgICBpZiAoY2hhbmdlTWFzayA9PSBOb0NoYW5nZXMgJiYgZ3JhcGhpY3NM YXllci0+bV9hbmltYXRpb25zLmlzRW1wdHkoKSAmJiBwZW5kaW5nQ29udGVudC5uZWVkc0Rpc3Bs YXlSZWN0LmlzRW1wdHkoKSAmJiAhcGVuZGluZ0NvbnRlbnQubmVlZHNEaXNwbGF5ICYmICFwZW5k aW5nQ29udGVudC5uZWVkc0Rpc3BsYXlDb250ZW50cykKICAgICAgICAgcmV0dXJuOwogCiAgICAg aWYgKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gSFRNTENvbnRlbnRUeXBlICYmIChj aGFuZ2VNYXNrICYgUGFyZW50Q2hhbmdlKSkgewpAQCAtNzczLDYgKzc3NCw3IEBAIHZvaWQgVGV4 dHVyZU1hcHBlck5vZGU6OnN5bmNDb21wb3NpdGluZ1N0YXRlU2VsZihHcmFwaGljc0xheWVyVGV4 dHVyZU1hcHBlciogZ3JhCiAgICAgbV9jdXJyZW50Q29udGVudC5pbWFnZSA9IHBlbmRpbmdDb250 ZW50LmltYWdlOwogICAgIG1fY3VycmVudENvbnRlbnQubWVkaWEgPSBwZW5kaW5nQ29udGVudC5t ZWRpYTsKICAgICBtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheSA9IG1fY3VycmVudENvbnRl bnQubmVlZHNEaXNwbGF5IHx8IHBlbmRpbmdDb250ZW50Lm5lZWRzRGlzcGxheTsKKyAgICBtX2N1 cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheUNvbnRlbnRzID0gbV9jdXJyZW50Q29udGVudC5uZWVk c0Rpc3BsYXlDb250ZW50cyB8fCBwZW5kaW5nQ29udGVudC5uZWVkc0Rpc3BsYXlDb250ZW50czsK ICAgICBpZiAoIW1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5KQogICAgICAgICBtX2N1cnJl bnRDb250ZW50Lm5lZWRzRGlzcGxheVJlY3QudW5pdGUocGVuZGluZ0NvbnRlbnQubmVlZHNEaXNw bGF5UmVjdCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmgKaW5kZXggZWI5YzY5MmUuLmQ0ZGE0MmMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0 dXJlTWFwcGVyTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCkBAIC0xMjAsNiArMTIwLDcgQEAgcHVibGljOgogICAg IHN0cnVjdCBDb250ZW50RGF0YSB7CiAgICAgICAgIEZsb2F0UmVjdCBuZWVkc0Rpc3BsYXlSZWN0 OwogICAgICAgICBib29sIG5lZWRzRGlzcGxheTsKKyAgICAgICAgYm9vbCBuZWVkc0Rpc3BsYXlD b250ZW50czsKICAgICAgICAgQ29sb3IgYmFja2dyb3VuZENvbG9yOwogCiAgICAgICAgIENvbnRl bnRUeXBlIGNvbnRlbnRUeXBlOwpAQCAtMTI3LDYgKzEyOCw3IEBAIHB1YmxpYzoKICAgICAgICAg Y29uc3QgVGV4dHVyZU1hcHBlclBsYXRmb3JtTGF5ZXIqIG1lZGlhOwogICAgICAgICBDb250ZW50 RGF0YSgpCiAgICAgICAgICAgICA6IG5lZWRzRGlzcGxheShmYWxzZSkKKyAgICAgICAgICAgICwg bmVlZHNEaXNwbGF5Q29udGVudHMoZmFsc2UpCiAgICAgICAgICAgICAsIGNvbnRlbnRUeXBlKEhU TUxDb250ZW50VHlwZSkKICAgICAgICAgICAgICwgaW1hZ2UoMCkKICAgICAgICAgICAgICwgbWVk aWEoMCkKLS0gCjEuNy41LjQKCg== 117958 2011-12-05 17:02:03 -0800 2011-12-05 17:45:10 -0800 patch 0001-TexMap-QT-Draw-the-borders-of-media-and-webgl-elemen.patch text/plain 9251 dongseong.hwang RnJvbSBiOTJhMjM5MWY0ZWY0NGI4NjA0NzgyOTJjZjllZTY0ZjMyM2VlYzJkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVu dHMgaW4KIFRleE1hcC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz ODE3CgpHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250ZW50IG9mIHRoZSBXZWJH TCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbApDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4 dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRoZSBjb250ZW50IG9mIGEKbWVkaWEvd2ViZ2wgbGF5 ZXIgYmVmb3JlIGRyYXdpbmcgdGhlIGFjdHVhbCBjYW52YXMuClRoaXMgbWFrZXMgTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIyICsr KysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFw cGVyLmNwcCB8ICAgIDggKysrKysKIC4uLi9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRl eHR1cmVNYXBwZXIuaCAgIHwgICAgMiArLQogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyTm9kZS5jcHAgfCAgIDMwICsrKysrKysrKysrKy0tLS0tLS0tCiAuLi4vcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmggICB8ICAgIDIgKwogNSBm aWxlcyBjaGFuZ2VkLCA1MSBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cK aW5kZXggYmFjZGUzYy4uMjgyZGE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDEx LTEyLTA1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgogCisgICAg ICAgIFtUZXhNYXBdW1FUXSBEcmF3IHRoZSBib3JkZXJzIG9mIG1lZGlhIGFuZCB3ZWJnbCBlbGVt ZW50cyBpbiBUZXhNYXAuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03MzgxNworCisgICAgICAgIEdyYXBoaWNzQ29udGV4dDNEIG9ubHkgZHJhd3MgdGhl IGNvbnRlbnQgb2YgdGhlIFdlYkdMIGNhbnZhcywgbm90IHRoZSBhZGRpdGlvbmFsCisgICAgICAg IENTUyBzdWNoIGFzIHRoZSBib3JkZXJzLiBUZXh0dXJlTWFwcGVyIHNob3VsZCByZW5kZXIgdGhl IGNvbnRlbnQgb2YgYQorICAgICAgICBtZWRpYS93ZWJnbCBsYXllciBiZWZvcmUgZHJhd2luZyB0 aGUgYWN0dWFsIGNhbnZhcy4KKyAgICAgICAgVGhpcyBtYWtlcyBMYXlvdXRUZXN0cy9jb21wb3Np dGluZy93ZWJnbC93ZWJnbC1yZWZsZWN0aW9uLmh0bWwgd29yay4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0Q29udGVudHNOZWVkc0Rpc3BsYXkpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5o OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cmVuZGVyQ29udGVudCk6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKToKKyAgICAg ICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZVNlbGYp OgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5o OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OkNvbnRlbnREYXRhOjpDb250 ZW50RGF0YSk6CisKKzIwMTEtMTItMDUgIEh1YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFu eTEwMC5uZXQ+CisKICAgICAgICAgW1F0XSBSZW1vdmUgcmVkdW5kYW50IG1fZ2xXaWRnZXQtPm1h a2VDdXJyZW50KCkgY2FsbHMgaW4gR3JhcGhpY3NDb250ZXh0M0RRdC4KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTczODE0CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwCmluZGV4IDMyMGUzMTQuLmVlMmI0YjAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xh eWVyVGV4dHVyZU1hcHBlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcApAQCAtNjcsNiArNjcsMTQg QEAgdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TmVlZHNEaXNwbGF5KCkKIAog LyogXHJlaW1wIChHcmFwaGljc0xheWVyLmgpCiAqLwordm9pZCBHcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlcjo6c2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKQoreworICAgIG1fcGVuZGluZ0NvbnRl bnQubmVlZHNEaXNwbGF5Q29udGVudHMgPSB0cnVlOworICAgIG5vdGlmeUNoYW5nZShUZXh0dXJl TWFwcGVyTm9kZTo6RGlzcGxheUNoYW5nZSk7Cit9CisKKy8qIFxyZWltcCAoR3JhcGhpY3NMYXll ci5oKQorKi8KIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldE5lZWRzRGlzcGxh eUluUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKG1fcGVuZGluZ0NvbnRl bnQubmVlZHNEaXNwbGF5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaApp bmRleCA5NDQ3ZjExLi5lYmI5YjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaApAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAKICAgICAvLyByZWltcHMgZnJvbSBH cmFwaGljc0xheWVyLmgKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5KCk7Ci0gICAg dmlydHVhbCB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCkgeyBzZXROZWVkc0Rpc3BsYXko KTsgfTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKTsKICAgICB2 aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5SW5SZWN0KGNvbnN0IEZsb2F0UmVjdCYpOwogICAg IHZpcnR1YWwgdm9pZCBzZXRQYXJlbnQoR3JhcGhpY3NMYXllciogbGF5ZXIpOwogICAgIHZpcnR1 YWwgYm9vbCBzZXRDaGlsZHJlbihjb25zdCBWZWN0b3I8R3JhcGhpY3NMYXllcio+Jik7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1Rl eHR1cmVNYXBwZXJOb2RlLmNwcAppbmRleCA0ZDIxNGRmLi42NDQ0NzQ3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJl TWFwcGVyTm9kZS5jcHAKQEAgLTI5Nyw4ICsyOTcsMTQgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9k ZTo6cmVuZGVyQ29udGVudChUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyLCBHcmFwaGljc0xh eWUKICAgICBpZiAoIXRleHR1cmVNYXBwZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICht X2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUpCisgICAgaWYg KG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gTWVkaWFDb250ZW50VHlwZSAmJiAhbV9j dXJyZW50Q29udGVudC5uZWVkc0Rpc3BsYXkpIHsKKyAgICAgICAgbV9jdXJyZW50Q29udGVudC5u ZWVkc0Rpc3BsYXlDb250ZW50cyA9IGZhbHNlOwogICAgICAgICByZXR1cm47CisgICAgfQorICAg IGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlICE9IE1lZGlhQ29udGVudFR5cGUpIHsK KyAgICAgICAgbV9jdXJyZW50Q29udGVudC5uZWVkc0Rpc3BsYXkgPSBtX2N1cnJlbnRDb250ZW50 Lm5lZWRzRGlzcGxheUNvbnRlbnRzOworICAgICAgICBtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlz cGxheUNvbnRlbnRzID0gZmFsc2U7CisgICAgfQogCiAgICAgLy8gRklYTUU6IEFkZCBkaXJlY3Rs eSBjb21wb3NpdGVkIGltYWdlcy4KICAgICBGbG9hdFJlY3QgZGlydHlSZWN0ID0gbV9jdXJyZW50 Q29udGVudC5uZWVkc0Rpc3BsYXkgPyBlbnRpcmVSZWN0KCkgOiBtX2N1cnJlbnRDb250ZW50Lm5l ZWRzRGlzcGxheVJlY3Q7CkBAIC0zODQsMTYgKzM5MCw2IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5v ZGU6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQog ICAgIGZsb2F0IG9wYWNpdHkgPSBvcHRpb25zLmlzU3VyZmFjZSA/IDEgOiBvcHRpb25zLm9wYWNp dHk7CiAgICAgRmxvYXRSZWN0IHRhcmdldFJlY3QgPSB0aGlzLT50YXJnZXRSZWN0KCk7CiAKLSAg ICBpZiAobV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlICYm IG1fY3VycmVudENvbnRlbnQubWVkaWEpIHsKLSAgICAgICAgaWYgKG1fc3RhdGUucmVwbGljYUxh eWVyICYmICFvcHRpb25zLmlzU3VyZmFjZSkKLSAgICAgICAgICAgIG1fY3VycmVudENvbnRlbnQu bWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0 UmVjdCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4KG1fdHJhbnNmb3Jtcy50YXJnZXQpLm11bHRpcGx5 KG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3RyYW5zZm9ybXMubG9jYWwpLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3BhY2l0eSAqIG1f c3RhdGUucmVwbGljYUxheWVyLT5tX29wYWNpdHksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXBsaWNhTWFza1RleHR1cmUgPyByZXBs aWNhTWFza1RleHR1cmUuZ2V0KCkgOiBtYXNrVGV4dHVyZS5nZXQoKSk7Ci0gICAgICAgIG1fY3Vy cmVudENvbnRlbnQubWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1h cHBlciwgdGFyZ2V0UmVjdCwgbV90cmFuc2Zvcm1zLnRhcmdldCwgb3BhY2l0eSwgb3B0aW9ucy5p c1N1cmZhY2UgPyAwIDogbWFza1RleHR1cmUuZ2V0KCkpOwotICAgICAgICByZXR1cm47Ci0gICAg fQotCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RPUkUpCiAgICAgVmVjdG9yPEV4dGVybmFsbHlN YW5hZ2VkVGlsZT4gdGlsZXNUb1BhaW50OwogCkBAIC00NDcsNiArNDQzLDE1IEBAIHZvaWQgVGV4 dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25z JiBvcHRpb25zKQogICAgICAgICBjb25zdCBGbG9hdFJlY3QgcmVjdCA9IHRhcmdldFJlY3RGb3JU aWxlUmVjdCh0YXJnZXRSZWN0LCBtX293bmVkVGlsZXNbaV0ucmVjdCk7CiAgICAgICAgIG9wdGlv bnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUoKnRleHR1cmUsIHJlY3QsIG1fdHJhbnNmb3Jt cy50YXJnZXQsIG9wYWNpdHksIG9wdGlvbnMuaXNTdXJmYWNlID8gMCA6IG1hc2tUZXh0dXJlLmdl dCgpKTsKICAgICB9CisKKyAgICBpZiAobV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBN ZWRpYUNvbnRlbnRUeXBlICYmIG1fY3VycmVudENvbnRlbnQubWVkaWEpIHsKKyAgICAgICAgaWYg KG1fc3RhdGUucmVwbGljYUxheWVyICYmICFvcHRpb25zLmlzU3VyZmFjZSkKKyAgICAgICAgICAg IG1fY3VycmVudENvbnRlbnQubWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4 dHVyZU1hcHBlciwgdGFyZ2V0UmVjdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4KG1fdHJhbnNmb3Jt cy50YXJnZXQpLm11bHRpcGx5KG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3RyYW5zZm9ybXMubG9j YWwpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgb3BhY2l0eSAqIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX29wYWNpdHksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXBsaWNh TWFza1RleHR1cmUgPyByZXBsaWNhTWFza1RleHR1cmUuZ2V0KCkgOiBtYXNrVGV4dHVyZS5nZXQo KSk7CisgICAgICAgIG1fY3VycmVudENvbnRlbnQubWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVy KG9wdGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0UmVjdCwgbV90cmFuc2Zvcm1zLnRhcmdldCwg b3BhY2l0eSwgb3B0aW9ucy5pc1N1cmZhY2UgPyAwIDogbWFza1RleHR1cmUuZ2V0KCkpOworICAg IH0KIH0KIAogaW50IFRleHR1cmVNYXBwZXJOb2RlOjpjb21wYXJlR3JhcGhpY3NMYXllcnNaVmFs dWUoY29uc3Qgdm9pZCogYSwgY29uc3Qgdm9pZCogYikKQEAgLTY5Miw3ICs2OTcsNyBAQCB2b2lk IFRleHR1cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZVNlbGYoR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIqIGdyYQogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIHN3 YXBDb250ZW50c0J1ZmZlcnMoKTsKICNlbmRpZgotICAgIGlmIChjaGFuZ2VNYXNrID09IE5vQ2hh bmdlcyAmJiBncmFwaGljc0xheWVyLT5tX2FuaW1hdGlvbnMuaXNFbXB0eSgpICYmIHBlbmRpbmdD b250ZW50Lm5lZWRzRGlzcGxheVJlY3QuaXNFbXB0eSgpICYmICFwZW5kaW5nQ29udGVudC5uZWVk c0Rpc3BsYXkpCisgICAgaWYgKGNoYW5nZU1hc2sgPT0gTm9DaGFuZ2VzICYmIGdyYXBoaWNzTGF5 ZXItPm1fYW5pbWF0aW9ucy5pc0VtcHR5KCkgJiYgcGVuZGluZ0NvbnRlbnQubmVlZHNEaXNwbGF5 UmVjdC5pc0VtcHR5KCkgJiYgIXBlbmRpbmdDb250ZW50Lm5lZWRzRGlzcGxheSAmJiAhcGVuZGlu Z0NvbnRlbnQubmVlZHNEaXNwbGF5Q29udGVudHMpCiAgICAgICAgIHJldHVybjsKIAogICAgIGlm IChtX2N1cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IEhUTUxDb250ZW50VHlwZSAmJiAoY2hh bmdlTWFzayAmIFBhcmVudENoYW5nZSkpIHsKQEAgLTc3Myw2ICs3NzgsNyBAQCB2b2lkIFRleHR1 cmVNYXBwZXJOb2RlOjpzeW5jQ29tcG9zaXRpbmdTdGF0ZVNlbGYoR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXIqIGdyYQogICAgIG1fY3VycmVudENvbnRlbnQuaW1hZ2UgPSBwZW5kaW5nQ29udGVu dC5pbWFnZTsKICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhID0gcGVuZGluZ0NvbnRlbnQubWVk aWE7CiAgICAgbV9jdXJyZW50Q29udGVudC5uZWVkc0Rpc3BsYXkgPSBtX2N1cnJlbnRDb250ZW50 Lm5lZWRzRGlzcGxheSB8fCBwZW5kaW5nQ29udGVudC5uZWVkc0Rpc3BsYXk7CisgICAgbV9jdXJy ZW50Q29udGVudC5uZWVkc0Rpc3BsYXlDb250ZW50cyA9IG1fY3VycmVudENvbnRlbnQubmVlZHNE aXNwbGF5Q29udGVudHMgfHwgcGVuZGluZ0NvbnRlbnQubmVlZHNEaXNwbGF5Q29udGVudHM7CiAg ICAgaWYgKCFtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheSkKICAgICAgICAgbV9jdXJyZW50 Q29udGVudC5uZWVkc0Rpc3BsYXlSZWN0LnVuaXRlKHBlbmRpbmdDb250ZW50Lm5lZWRzRGlzcGxh eVJlY3QpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5oCmluZGV4IGViOWM2OTJlLi5kNGRhNDJjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVy ZU1hcHBlck5vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlck5vZGUuaApAQCAtMTIwLDYgKzEyMCw3IEBAIHB1YmxpYzoKICAgICBz dHJ1Y3QgQ29udGVudERhdGEgewogICAgICAgICBGbG9hdFJlY3QgbmVlZHNEaXNwbGF5UmVjdDsK ICAgICAgICAgYm9vbCBuZWVkc0Rpc3BsYXk7CisgICAgICAgIGJvb2wgbmVlZHNEaXNwbGF5Q29u dGVudHM7CiAgICAgICAgIENvbG9yIGJhY2tncm91bmRDb2xvcjsKIAogICAgICAgICBDb250ZW50 VHlwZSBjb250ZW50VHlwZTsKQEAgLTEyNyw2ICsxMjgsNyBAQCBwdWJsaWM6CiAgICAgICAgIGNv bnN0IFRleHR1cmVNYXBwZXJQbGF0Zm9ybUxheWVyKiBtZWRpYTsKICAgICAgICAgQ29udGVudERh dGEoKQogICAgICAgICAgICAgOiBuZWVkc0Rpc3BsYXkoZmFsc2UpCisgICAgICAgICAgICAsIG5l ZWRzRGlzcGxheUNvbnRlbnRzKGZhbHNlKQogICAgICAgICAgICAgLCBjb250ZW50VHlwZShIVE1M Q29udGVudFR5cGUpCiAgICAgICAgICAgICAsIGltYWdlKDApCiAgICAgICAgICAgICAsIG1lZGlh KDApCi0tIAoxLjcuNS40Cgo= 117964 2011-12-05 17:45:10 -0800 2011-12-05 18:20:42 -0800 patch 0001-TexMap-QT-Draw-the-borders-of-media-and-webgl-elemen.patch text/plain 6687 dongseong.hwang RnJvbSA4YTUzNGFmMWMyNGZjMWM3ZDMxNzBkYWRiYjhjOTM3ZTVlN2NmMjAyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVu dHMgaW4KIFRleE1hcC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz ODE3CgpHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250ZW50IG9mIHRoZSBXZWJH TCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbApDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4 dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRoZSBjb250ZW50IG9mIGEKbWVkaWEvd2ViZ2wgbGF5 ZXIgYmVmb3JlIGRyYXdpbmcgdGhlIGFjdHVhbCBjYW52YXMuClRoaXMgbWFrZXMgTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsr KysrKysrKysrKysrKysrKwogLi4uL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVy ZU1hcHBlci5jcHAgfCAgICA5ICsrKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNz TGF5ZXJUZXh0dXJlTWFwcGVyLmggICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwIHwgICAyMSArKysrKysrKystLS0tLS0tLS0tCiA0 IGZpbGVzIGNoYW5nZWQsIDM5IGluc2VydGlvbnMoKyksIDEyIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBiYWNkZTNjLi42YzEyZDNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIw MTEtMTItMDUgIEh1YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKKyAg ICAgICAgW1RleE1hcF1bUVRdIERyYXcgdGhlIGJvcmRlcnMgb2YgbWVkaWEgYW5kIHdlYmdsIGVs ZW1lbnRzIGluIFRleE1hcC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTczODE3CisKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Qgb25seSBkcmF3cyB0 aGUgY29udGVudCBvZiB0aGUgV2ViR0wgY2FudmFzLCBub3QgdGhlIGFkZGl0aW9uYWwKKyAgICAg ICAgQ1NTIHN1Y2ggYXMgdGhlIGJvcmRlcnMuIFRleHR1cmVNYXBwZXIgc2hvdWxkIHJlbmRlciB0 aGUgY29udGVudCBvZiBhCisgICAgICAgIG1lZGlhL3dlYmdsIGxheWVyIGJlZm9yZSBkcmF3aW5n IHRoZSBhY3R1YWwgY2FudmFzLgorICAgICAgICBUaGlzIG1ha2VzIExheW91dFRlc3RzL2NvbXBv c2l0aW5nL3dlYmdsL3dlYmdsLXJlZmxlY3Rpb24uaHRtbCB3b3JrLgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4 bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c05lZWRzRGlzcGxheSk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVy Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2Rl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpyZW5kZXJDb250ZW50 KToKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYpOgorCisy MDExLTEyLTA1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCiAg ICAgICAgIFtRdF0gUmVtb3ZlIHJlZHVuZGFudCBtX2dsV2lkZ2V0LT5tYWtlQ3VycmVudCgpIGNh bGxzIGluIEdyYXBoaWNzQ29udGV4dDNEUXQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03MzgxNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0 dXJlTWFwcGVyLmNwcAppbmRleCAzMjBlMzE0Li43ZWY5ODE4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBw ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFw aGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTY3LDYgKzY3LDE1IEBAIHZvaWQgR3JhcGhp Y3NMYXllclRleHR1cmVNYXBwZXI6OnNldE5lZWRzRGlzcGxheSgpCiAKIC8qIFxyZWltcCAoR3Jh cGhpY3NMYXllci5oKQogKi8KK3ZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldENv bnRlbnRzTmVlZHNEaXNwbGF5KCkKK3sKKyAgICBpZiAoIW5vZGUoKS0+bWVkaWEoKSkKKyAgICAg ICAgbV9wZW5kaW5nQ29udGVudC5uZWVkc0Rpc3BsYXkgPSB0cnVlOworICAgIG5vdGlmeUNoYW5n ZShUZXh0dXJlTWFwcGVyTm9kZTo6RGlzcGxheUNoYW5nZSk7Cit9CisKKy8qIFxyZWltcCAoR3Jh cGhpY3NMYXllci5oKQorKi8KIHZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldE5l ZWRzRGlzcGxheUluUmVjdChjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiB7CiAgICAgaWYgKG1fcGVu ZGluZ0NvbnRlbnQubmVlZHNEaXNwbGF5KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVN YXBwZXIuaAppbmRleCA5NDQ3ZjExLi5lYmI5YjUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXll clRleHR1cmVNYXBwZXIuaApAQCAtNDUsNyArNDUsNyBAQCBwdWJsaWM6CiAKICAgICAvLyByZWlt cHMgZnJvbSBHcmFwaGljc0xheWVyLmgKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5 KCk7Ci0gICAgdmlydHVhbCB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCkgeyBzZXROZWVk c0Rpc3BsYXkoKTsgfTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXko KTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0TmVlZHNEaXNwbGF5SW5SZWN0KGNvbnN0IEZsb2F0UmVj dCYpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRQYXJlbnQoR3JhcGhpY3NMYXllciogbGF5ZXIpOwog ICAgIHZpcnR1YWwgYm9vbCBzZXRDaGlsZHJlbihjb25zdCBWZWN0b3I8R3JhcGhpY3NMYXllcio+ Jik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAv VGV4dHVyZU1hcHBlck5vZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAppbmRleCA0ZDIxNGRmLi4zYjI1NzFmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1h cHBlck5vZGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAKQEAgLTI5Nyw3ICsyOTcsNyBAQCB2b2lkIFRleHR1cmVN YXBwZXJOb2RlOjpyZW5kZXJDb250ZW50KFRleHR1cmVNYXBwZXIqIHRleHR1cmVNYXBwZXIsIEdy YXBoaWNzTGF5ZQogICAgIGlmICghdGV4dHVyZU1hcHBlcikKICAgICAgICAgcmV0dXJuOwogCi0g ICAgaWYgKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gTWVkaWFDb250ZW50VHlwZSkK KyAgICBpZiAobV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBl ICYmICFtX2N1cnJlbnRDb250ZW50Lm5lZWRzRGlzcGxheSkKICAgICAgICAgcmV0dXJuOwogCiAg ICAgLy8gRklYTUU6IEFkZCBkaXJlY3RseSBjb21wb3NpdGVkIGltYWdlcy4KQEAgLTM4NCwxNiAr Mzg0LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKGNvbnN0IFRleHR1cmVN YXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMpCiAgICAgZmxvYXQgb3BhY2l0eSA9IG9wdGlvbnMu aXNTdXJmYWNlID8gMSA6IG9wdGlvbnMub3BhY2l0eTsKICAgICBGbG9hdFJlY3QgdGFyZ2V0UmVj dCA9IHRoaXMtPnRhcmdldFJlY3QoKTsKIAotICAgIGlmIChtX2N1cnJlbnRDb250ZW50LmNvbnRl bnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUgJiYgbV9jdXJyZW50Q29udGVudC5tZWRpYSkgewot ICAgICAgICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgIW9wdGlvbnMuaXNTdXJmYWNlKQot ICAgICAgICAgICAgbV9jdXJyZW50Q29udGVudC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBwZXIo b3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJnZXRSZWN0LAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXgo bV90cmFuc2Zvcm1zLnRhcmdldCkubXVsdGlwbHkobV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fdHJh bnNmb3Jtcy5sb2NhbCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBvcGFjaXR5ICogbV9zdGF0ZS5yZXBsaWNhTGF5ZXItPm1fb3BhY2l0 eSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJlcGxpY2FNYXNrVGV4dHVyZSA/IHJlcGxpY2FNYXNrVGV4dHVyZS5nZXQoKSA6IG1hc2tU ZXh0dXJlLmdldCgpKTsKLSAgICAgICAgbV9jdXJyZW50Q29udGVudC5tZWRpYS0+cGFpbnRUb1Rl eHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJnZXRSZWN0LCBtX3RyYW5zZm9y bXMudGFyZ2V0LCBvcGFjaXR5LCBvcHRpb25zLmlzU3VyZmFjZSA/IDAgOiBtYXNrVGV4dHVyZS5n ZXQoKSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICNpZiBVU0UoVElMRURfQkFDS0lOR19T VE9SRSkKICAgICBWZWN0b3I8RXh0ZXJuYWxseU1hbmFnZWRUaWxlPiB0aWxlc1RvUGFpbnQ7CiAK QEAgLTQ0Nyw2ICs0MzcsMTUgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6cGFpbnRTZWxmKGNv bnN0IFRleHR1cmVNYXBwZXJQYWludE9wdGlvbnMmIG9wdGlvbnMpCiAgICAgICAgIGNvbnN0IEZs b2F0UmVjdCByZWN0ID0gdGFyZ2V0UmVjdEZvclRpbGVSZWN0KHRhcmdldFJlY3QsIG1fb3duZWRU aWxlc1tpXS5yZWN0KTsKICAgICAgICAgb3B0aW9ucy50ZXh0dXJlTWFwcGVyLT5kcmF3VGV4dHVy ZSgqdGV4dHVyZSwgcmVjdCwgbV90cmFuc2Zvcm1zLnRhcmdldCwgb3BhY2l0eSwgb3B0aW9ucy5p c1N1cmZhY2UgPyAwIDogbWFza1RleHR1cmUuZ2V0KCkpOwogICAgIH0KKworICAgIGlmIChtX2N1 cnJlbnRDb250ZW50LmNvbnRlbnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUgJiYgbV9jdXJyZW50 Q29udGVudC5tZWRpYSkgeworICAgICAgICBpZiAobV9zdGF0ZS5yZXBsaWNhTGF5ZXIgJiYgIW9w dGlvbnMuaXNTdXJmYWNlKQorICAgICAgICAgICAgbV9jdXJyZW50Q29udGVudC5tZWRpYS0+cGFp bnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJnZXRSZWN0LAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVHJh bnNmb3JtYXRpb25NYXRyaXgobV90cmFuc2Zvcm1zLnRhcmdldCkubXVsdGlwbHkobV9zdGF0ZS5y ZXBsaWNhTGF5ZXItPm1fdHJhbnNmb3Jtcy5sb2NhbCksCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcGFjaXR5ICogbV9zdGF0ZS5yZXBs aWNhTGF5ZXItPm1fb3BhY2l0eSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlcGxpY2FNYXNrVGV4dHVyZSA/IHJlcGxpY2FNYXNrVGV4 dHVyZS5nZXQoKSA6IG1hc2tUZXh0dXJlLmdldCgpKTsKKyAgICAgICAgbV9jdXJyZW50Q29udGVu dC5tZWRpYS0+cGFpbnRUb1RleHR1cmVNYXBwZXIob3B0aW9ucy50ZXh0dXJlTWFwcGVyLCB0YXJn ZXRSZWN0LCBtX3RyYW5zZm9ybXMudGFyZ2V0LCBvcGFjaXR5LCBvcHRpb25zLmlzU3VyZmFjZSA/ IDAgOiBtYXNrVGV4dHVyZS5nZXQoKSk7CisgICAgfQogfQogCiBpbnQgVGV4dHVyZU1hcHBlck5v ZGU6OmNvbXBhcmVHcmFwaGljc0xheWVyc1pWYWx1ZShjb25zdCB2b2lkKiBhLCBjb25zdCB2b2lk KiBiKQotLSAKMS43LjUuNAoK 117974 2011-12-05 18:20:42 -0800 2011-12-05 19:33:38 -0800 patch 0001-TexMap-QT-Draw-the-borders-of-media-and-webgl-elemen.patch text/plain 6628 dongseong.hwang RnJvbSAzZjhlNjBkY2E5NTY2YTgwNzFmNzdkMDhiMDVmMmFlYjgyZjEwY2M2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVu dHMgaW4KIFRleE1hcC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz ODE3CgpHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250ZW50IG9mIHRoZSBXZWJH TCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbApDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4 dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRoZSBjb250ZW50IG9mIGEKbWVkaWEvd2ViZ2wgbGF5 ZXIgYmVmb3JlIGRyYXdpbmcgdGhlIGFjdHVhbCBjYW52YXMuClRoaXMgbWFrZXMgTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsr KysrKysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmNwcCB8ICAgIDcgKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5 ZXJUZXh0dXJlTWFwcGVyLmggICB8ICAgIDIgKy0KIC4uLi9wbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwIHwgICAyMiArKysrKysrKy0tLS0tLS0tLS0tCiA0IGZp bGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCBiYWNkZTNjLi42YzEyZDNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEt MTItMDUgIEh1YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CiAKKyAgICAg ICAgW1RleE1hcF1bUVRdIERyYXcgdGhlIGJvcmRlcnMgb2YgbWVkaWEgYW5kIHdlYmdsIGVsZW1l bnRzIGluIFRleE1hcC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTczODE3CisKKyAgICAgICAgR3JhcGhpY3NDb250ZXh0M0Qgb25seSBkcmF3cyB0aGUg Y29udGVudCBvZiB0aGUgV2ViR0wgY2FudmFzLCBub3QgdGhlIGFkZGl0aW9uYWwKKyAgICAgICAg Q1NTIHN1Y2ggYXMgdGhlIGJvcmRlcnMuIFRleHR1cmVNYXBwZXIgc2hvdWxkIHJlbmRlciB0aGUg Y29udGVudCBvZiBhCisgICAgICAgIG1lZGlhL3dlYmdsIGxheWVyIGJlZm9yZSBkcmF3aW5nIHRo ZSBhY3R1YWwgY2FudmFzLgorICAgICAgICBUaGlzIG1ha2VzIExheW91dFRlc3RzL2NvbXBvc2l0 aW5nL3dlYmdsL3dlYmdsLXJlZmxlY3Rpb24uaHRtbCB3b3JrLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXRDb250ZW50c05lZWRzRGlzcGxheSk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmg6 CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpyZW5kZXJDb250ZW50KToK KyAgICAgICAgKFdlYkNvcmU6OlRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNlbGYpOgorCisyMDEx LTEyLTA1ICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAubmV0PgorCiAgICAg ICAgIFtRdF0gUmVtb3ZlIHJlZHVuZGFudCBtX2dsV2lkZ2V0LT5tYWtlQ3VycmVudCgpIGNhbGxz IGluIEdyYXBoaWNzQ29udGV4dDNEUXQuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD03MzgxNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmNwcAppbmRleCAzMjBlMzE0Li5kMDhiZDIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlci5jcHAKQEAgLTY3LDYgKzY3LDEzIEBAIHZvaWQgR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXI6OnNldE5lZWRzRGlzcGxheSgpCiAKIC8qIFxyZWltcCAoR3JhcGhp Y3NMYXllci5oKQogKi8KK3ZvaWQgR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldENvbnRl bnRzTmVlZHNEaXNwbGF5KCkKK3sKKyAgICBub3RpZnlDaGFuZ2UoVGV4dHVyZU1hcHBlck5vZGU6 OkRpc3BsYXlDaGFuZ2UpOworfQorCisvKiBccmVpbXAgKEdyYXBoaWNzTGF5ZXIuaCkKKyovCiB2 b2lkIEdyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyOjpzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29u c3QgRmxvYXRSZWN0JiByZWN0KQogewogICAgIGlmIChtX3BlbmRpbmdDb250ZW50Lm5lZWRzRGlz cGxheSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1h cC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKaW5kZXggOTQ0N2Yx MS4uZWJiOWI1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv dGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmgKQEAg LTQ1LDcgKzQ1LDcgQEAgcHVibGljOgogCiAgICAgLy8gcmVpbXBzIGZyb20gR3JhcGhpY3NMYXll ci5oCiAgICAgdmlydHVhbCB2b2lkIHNldE5lZWRzRGlzcGxheSgpOwotICAgIHZpcnR1YWwgdm9p ZCBzZXRDb250ZW50c05lZWRzRGlzcGxheSgpIHsgc2V0TmVlZHNEaXNwbGF5KCk7IH07CisgICAg dmlydHVhbCB2b2lkIHNldENvbnRlbnRzTmVlZHNEaXNwbGF5KCk7CiAgICAgdmlydHVhbCB2b2lk IHNldE5lZWRzRGlzcGxheUluUmVjdChjb25zdCBGbG9hdFJlY3QmKTsKICAgICB2aXJ0dWFsIHZv aWQgc2V0UGFyZW50KEdyYXBoaWNzTGF5ZXIqIGxheWVyKTsKICAgICB2aXJ0dWFsIGJvb2wgc2V0 Q2hpbGRyZW4oY29uc3QgVmVjdG9yPEdyYXBoaWNzTGF5ZXIqPiYpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVy Tm9kZS5jcHAKaW5kZXggNGQyMTRkZi4uNDJiZDJjYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJOb2RlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu Y3BwCkBAIC0yOTcsOSArMjk3LDYgQEAgdm9pZCBUZXh0dXJlTWFwcGVyTm9kZTo6cmVuZGVyQ29u dGVudChUZXh0dXJlTWFwcGVyKiB0ZXh0dXJlTWFwcGVyLCBHcmFwaGljc0xheWUKICAgICBpZiAo IXRleHR1cmVNYXBwZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChtX2N1cnJlbnRDb250 ZW50LmNvbnRlbnRUeXBlID09IE1lZGlhQ29udGVudFR5cGUpCi0gICAgICAgIHJldHVybjsKLQog ICAgIC8vIEZJWE1FOiBBZGQgZGlyZWN0bHkgY29tcG9zaXRlZCBpbWFnZXMuCiAgICAgRmxvYXRS ZWN0IGRpcnR5UmVjdCA9IG1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5ID8gZW50aXJlUmVj dCgpIDogbV9jdXJyZW50Q29udGVudC5uZWVkc0Rpc3BsYXlSZWN0OwogCkBAIC0zODQsMTYgKzM4 MSw2IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25zdCBUZXh0dXJlTWFw cGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogICAgIGZsb2F0IG9wYWNpdHkgPSBvcHRpb25zLmlz U3VyZmFjZSA/IDEgOiBvcHRpb25zLm9wYWNpdHk7CiAgICAgRmxvYXRSZWN0IHRhcmdldFJlY3Qg PSB0aGlzLT50YXJnZXRSZWN0KCk7CiAKLSAgICBpZiAobV9jdXJyZW50Q29udGVudC5jb250ZW50 VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlICYmIG1fY3VycmVudENvbnRlbnQubWVkaWEpIHsKLSAg ICAgICAgaWYgKG1fc3RhdGUucmVwbGljYUxheWVyICYmICFvcHRpb25zLmlzU3VyZmFjZSkKLSAg ICAgICAgICAgIG1fY3VycmVudENvbnRlbnQubWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9w dGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0UmVjdCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRyYW5zZm9ybWF0aW9uTWF0cml4KG1f dHJhbnNmb3Jtcy50YXJnZXQpLm11bHRpcGx5KG1fc3RhdGUucmVwbGljYUxheWVyLT5tX3RyYW5z Zm9ybXMubG9jYWwpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgb3BhY2l0eSAqIG1fc3RhdGUucmVwbGljYUxheWVyLT5tX29wYWNpdHks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByZXBsaWNhTWFza1RleHR1cmUgPyByZXBsaWNhTWFza1RleHR1cmUuZ2V0KCkgOiBtYXNrVGV4 dHVyZS5nZXQoKSk7Ci0gICAgICAgIG1fY3VycmVudENvbnRlbnQubWVkaWEtPnBhaW50VG9UZXh0 dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0UmVjdCwgbV90cmFuc2Zvcm1z LnRhcmdldCwgb3BhY2l0eSwgb3B0aW9ucy5pc1N1cmZhY2UgPyAwIDogbWFza1RleHR1cmUuZ2V0 KCkpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RP UkUpCiAgICAgVmVjdG9yPEV4dGVybmFsbHlNYW5hZ2VkVGlsZT4gdGlsZXNUb1BhaW50OwogCkBA IC00NDcsNiArNDM0LDE1IEBAIHZvaWQgVGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZihjb25z dCBUZXh0dXJlTWFwcGVyUGFpbnRPcHRpb25zJiBvcHRpb25zKQogICAgICAgICBjb25zdCBGbG9h dFJlY3QgcmVjdCA9IHRhcmdldFJlY3RGb3JUaWxlUmVjdCh0YXJnZXRSZWN0LCBtX293bmVkVGls ZXNbaV0ucmVjdCk7CiAgICAgICAgIG9wdGlvbnMudGV4dHVyZU1hcHBlci0+ZHJhd1RleHR1cmUo KnRleHR1cmUsIHJlY3QsIG1fdHJhbnNmb3Jtcy50YXJnZXQsIG9wYWNpdHksIG9wdGlvbnMuaXNT dXJmYWNlID8gMCA6IG1hc2tUZXh0dXJlLmdldCgpKTsKICAgICB9CisKKyAgICBpZiAobV9jdXJy ZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlICYmIG1fY3VycmVudENv bnRlbnQubWVkaWEpIHsKKyAgICAgICAgaWYgKG1fc3RhdGUucmVwbGljYUxheWVyICYmICFvcHRp b25zLmlzU3VyZmFjZSkKKyAgICAgICAgICAgIG1fY3VycmVudENvbnRlbnQubWVkaWEtPnBhaW50 VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0UmVjdCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRyYW5z Zm9ybWF0aW9uTWF0cml4KG1fdHJhbnNmb3Jtcy50YXJnZXQpLm11bHRpcGx5KG1fc3RhdGUucmVw bGljYUxheWVyLT5tX3RyYW5zZm9ybXMubG9jYWwpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3BhY2l0eSAqIG1fc3RhdGUucmVwbGlj YUxheWVyLT5tX29wYWNpdHksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByZXBsaWNhTWFza1RleHR1cmUgPyByZXBsaWNhTWFza1RleHR1 cmUuZ2V0KCkgOiBtYXNrVGV4dHVyZS5nZXQoKSk7CisgICAgICAgIG1fY3VycmVudENvbnRlbnQu bWVkaWEtPnBhaW50VG9UZXh0dXJlTWFwcGVyKG9wdGlvbnMudGV4dHVyZU1hcHBlciwgdGFyZ2V0 UmVjdCwgbV90cmFuc2Zvcm1zLnRhcmdldCwgb3BhY2l0eSwgb3B0aW9ucy5pc1N1cmZhY2UgPyAw IDogbWFza1RleHR1cmUuZ2V0KCkpOworICAgIH0KIH0KIAogaW50IFRleHR1cmVNYXBwZXJOb2Rl Ojpjb21wYXJlR3JhcGhpY3NMYXllcnNaVmFsdWUoY29uc3Qgdm9pZCogYSwgY29uc3Qgdm9pZCog YikKLS0gCjEuNy41LjQKCg== 117980 2011-12-05 19:33:38 -0800 2011-12-06 02:47:29 -0800 patch 0001-TexMap-QT-Draw-the-borders-of-media-and-webgl-elemen.patch text/plain 6704 dongseong.hwang RnJvbSBkNWMwYjdkMmYzMzYzZDcyOTg5MWMxYWQzNmVlYmFhOGQwNGVlNTE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIdWFuZyBEb25nc3VuZyA8bHV4dGVsbGFAY29tcGFueTEwMC5u ZXQ+CkRhdGU6IFdlZCwgMTkgT2N0IDIwMTEgMTE6NTY6NTYgKzA5MDAKU3ViamVjdDogW1BBVENI XSBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxlbWVu dHMgaW4KIFRleE1hcC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcz ODE3CgpHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRoZSBjb250ZW50IG9mIHRoZSBXZWJH TCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbApDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4 dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRoZSBjb250ZW50IG9mIGEKbWVkaWEvd2ViZ2wgbGF5 ZXIgYmVmb3JlIGRyYXdpbmcgdGhlIGFjdHVhbCBjYW52YXMuClRoaXMgbWFrZXMgTGF5b3V0VGVz dHMvY29tcG9zaXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCi0tLQogU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsr KysrKysrKysrKysrKysrCiAuLi4vZ3JhcGhpY3MvdGV4bWFwL0dyYXBoaWNzTGF5ZXJUZXh0dXJl TWFwcGVyLmNwcCB8ICAgIDkgKysrKysrKysKIC4uLi9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NM YXllclRleHR1cmVNYXBwZXIuaCAgIHwgICAgMiArLQogLi4uL3BsYXRmb3JtL2dyYXBoaWNzL3Rl eG1hcC9UZXh0dXJlTWFwcGVyTm9kZS5jcHAgfCAgIDIyICsrKysrKysrLS0tLS0tLS0tLS0KIDQg ZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGJhY2RlM2MuLjZjMTJkM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNCBAQAogMjAx MS0xMi0wNSAgSHVhbmcgRG9uZ3N1bmcgIDxsdXh0ZWxsYUBjb21wYW55MTAwLm5ldD4KIAorICAg ICAgICBbVGV4TWFwXVtRVF0gRHJhdyB0aGUgYm9yZGVycyBvZiBtZWRpYSBhbmQgd2ViZ2wgZWxl bWVudHMgaW4gVGV4TWFwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzM4MTcKKworICAgICAgICBHcmFwaGljc0NvbnRleHQzRCBvbmx5IGRyYXdzIHRo ZSBjb250ZW50IG9mIHRoZSBXZWJHTCBjYW52YXMsIG5vdCB0aGUgYWRkaXRpb25hbAorICAgICAg ICBDU1Mgc3VjaCBhcyB0aGUgYm9yZGVycy4gVGV4dHVyZU1hcHBlciBzaG91bGQgcmVuZGVyIHRo ZSBjb250ZW50IG9mIGEKKyAgICAgICAgbWVkaWEvd2ViZ2wgbGF5ZXIgYmVmb3JlIGRyYXdpbmcg dGhlIGFjdHVhbCBjYW52YXMuCisgICAgICAgIFRoaXMgbWFrZXMgTGF5b3V0VGVzdHMvY29tcG9z aXRpbmcvd2ViZ2wvd2ViZ2wtcmVmbGVjdGlvbi5odG1sIHdvcmsuCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXht YXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3Jh cGhpY3NMYXllclRleHR1cmVNYXBwZXI6OnNldENvbnRlbnRzTmVlZHNEaXNwbGF5KToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnJlbmRlckNvbnRlbnQp OgorICAgICAgICAoV2ViQ29yZTo6VGV4dHVyZU1hcHBlck5vZGU6OnBhaW50U2VsZik6CisKKzIw MTEtMTItMDUgIEh1YW5nIERvbmdzdW5nICA8bHV4dGVsbGFAY29tcGFueTEwMC5uZXQ+CisKICAg ICAgICAgW1F0XSBSZW1vdmUgcmVkdW5kYW50IG1fZ2xXaWRnZXQtPm1ha2VDdXJyZW50KCkgY2Fs bHMgaW4gR3JhcGhpY3NDb250ZXh0M0RRdC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTczODE0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1 cmVNYXBwZXIuY3BwCmluZGV4IDMyMGUzMTQuLjdlZjk4MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL0dyYXBo aWNzTGF5ZXJUZXh0dXJlTWFwcGVyLmNwcApAQCAtNjcsNiArNjcsMTUgQEAgdm9pZCBHcmFwaGlj c0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TmVlZHNEaXNwbGF5KCkKIAogLyogXHJlaW1wIChHcmFw aGljc0xheWVyLmgpCiAqLwordm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0Q29u dGVudHNOZWVkc0Rpc3BsYXkoKQoreworICAgIGlmICghbm9kZSgpLT5tZWRpYSgpKQorICAgICAg ICBtX3BlbmRpbmdDb250ZW50Lm5lZWRzRGlzcGxheSA9IHRydWU7CisgICAgbm90aWZ5Q2hhbmdl KFRleHR1cmVNYXBwZXJOb2RlOjpEaXNwbGF5Q2hhbmdlKTsKK30KKworLyogXHJlaW1wIChHcmFw aGljc0xheWVyLmgpCisqLwogdm9pZCBHcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlcjo6c2V0TmVl ZHNEaXNwbGF5SW5SZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKICAgICBpZiAobV9wZW5k aW5nQ29udGVudC5uZWVkc0Rpc3BsYXkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy90ZXhtYXAvR3JhcGhpY3NMYXllclRleHR1cmVNYXBwZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1h cHBlci5oCmluZGV4IDk0NDdmMTEuLmViYjliNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVyVGV4dHVyZU1hcHBlci5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9HcmFwaGljc0xheWVy VGV4dHVyZU1hcHBlci5oCkBAIC00NSw3ICs0NSw3IEBAIHB1YmxpYzoKIAogICAgIC8vIHJlaW1w cyBmcm9tIEdyYXBoaWNzTGF5ZXIuaAogICAgIHZpcnR1YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXko KTsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0Q29udGVudHNOZWVkc0Rpc3BsYXkoKSB7IHNldE5lZWRz RGlzcGxheSgpOyB9OworICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c05lZWRzRGlzcGxheSgp OwogICAgIHZpcnR1YWwgdm9pZCBzZXROZWVkc0Rpc3BsYXlJblJlY3QoY29uc3QgRmxvYXRSZWN0 Jik7CiAgICAgdmlydHVhbCB2b2lkIHNldFBhcmVudChHcmFwaGljc0xheWVyKiBsYXllcik7CiAg ICAgdmlydHVhbCBib29sIHNldENoaWxkcmVuKGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4m KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9U ZXh0dXJlTWFwcGVyTm9kZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy90 ZXhtYXAvVGV4dHVyZU1hcHBlck5vZGUuY3BwCmluZGV4IDRkMjE0ZGYuLjQyYmQyY2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFw cGVyTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFw L1RleHR1cmVNYXBwZXJOb2RlLmNwcApAQCAtMjk3LDkgKzI5Nyw2IEBAIHZvaWQgVGV4dHVyZU1h cHBlck5vZGU6OnJlbmRlckNvbnRlbnQoVGV4dHVyZU1hcHBlciogdGV4dHVyZU1hcHBlciwgR3Jh cGhpY3NMYXllCiAgICAgaWYgKCF0ZXh0dXJlTWFwcGVyKQogICAgICAgICByZXR1cm47CiAKLSAg ICBpZiAobV9jdXJyZW50Q29udGVudC5jb250ZW50VHlwZSA9PSBNZWRpYUNvbnRlbnRUeXBlKQot ICAgICAgICByZXR1cm47Ci0KICAgICAvLyBGSVhNRTogQWRkIGRpcmVjdGx5IGNvbXBvc2l0ZWQg aW1hZ2VzLgogICAgIEZsb2F0UmVjdCBkaXJ0eVJlY3QgPSBtX2N1cnJlbnRDb250ZW50Lm5lZWRz RGlzcGxheSA/IGVudGlyZVJlY3QoKSA6IG1fY3VycmVudENvbnRlbnQubmVlZHNEaXNwbGF5UmVj dDsKIApAQCAtMzg0LDE2ICszODEsNiBAQCB2b2lkIFRleHR1cmVNYXBwZXJOb2RlOjpwYWludFNl bGYoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucykKICAgICBmbG9hdCBv cGFjaXR5ID0gb3B0aW9ucy5pc1N1cmZhY2UgPyAxIDogb3B0aW9ucy5vcGFjaXR5OwogICAgIEZs b2F0UmVjdCB0YXJnZXRSZWN0ID0gdGhpcy0+dGFyZ2V0UmVjdCgpOwogCi0gICAgaWYgKG1fY3Vy cmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gTWVkaWFDb250ZW50VHlwZSAmJiBtX2N1cnJlbnRD b250ZW50Lm1lZGlhKSB7Ci0gICAgICAgIGlmIChtX3N0YXRlLnJlcGxpY2FMYXllciAmJiAhb3B0 aW9ucy5pc1N1cmZhY2UpCi0gICAgICAgICAgICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhLT5wYWlu dFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIsIHRhcmdldFJlY3QsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUcmFu c2Zvcm1hdGlvbk1hdHJpeChtX3RyYW5zZm9ybXMudGFyZ2V0KS5tdWx0aXBseShtX3N0YXRlLnJl cGxpY2FMYXllci0+bV90cmFuc2Zvcm1zLmxvY2FsKSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wYWNpdHkgKiBtX3N0YXRlLnJlcGxp Y2FMYXllci0+bV9vcGFjaXR5LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmVwbGljYU1hc2tUZXh0dXJlID8gcmVwbGljYU1hc2tUZXh0 dXJlLmdldCgpIDogbWFza1RleHR1cmUuZ2V0KCkpOwotICAgICAgICBtX2N1cnJlbnRDb250ZW50 Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIsIHRhcmdl dFJlY3QsIG1fdHJhbnNmb3Jtcy50YXJnZXQsIG9wYWNpdHksIG9wdGlvbnMuaXNTdXJmYWNlID8g MCA6IG1hc2tUZXh0dXJlLmdldCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogI2lmIFVT RShUSUxFRF9CQUNLSU5HX1NUT1JFKQogICAgIFZlY3RvcjxFeHRlcm5hbGx5TWFuYWdlZFRpbGU+ IHRpbGVzVG9QYWludDsKIApAQCAtNDQ3LDYgKzQzNCwxNSBAQCB2b2lkIFRleHR1cmVNYXBwZXJO b2RlOjpwYWludFNlbGYoY29uc3QgVGV4dHVyZU1hcHBlclBhaW50T3B0aW9ucyYgb3B0aW9ucykK ICAgICAgICAgY29uc3QgRmxvYXRSZWN0IHJlY3QgPSB0YXJnZXRSZWN0Rm9yVGlsZVJlY3QodGFy Z2V0UmVjdCwgbV9vd25lZFRpbGVzW2ldLnJlY3QpOwogICAgICAgICBvcHRpb25zLnRleHR1cmVN YXBwZXItPmRyYXdUZXh0dXJlKCp0ZXh0dXJlLCByZWN0LCBtX3RyYW5zZm9ybXMudGFyZ2V0LCBv cGFjaXR5LCBvcHRpb25zLmlzU3VyZmFjZSA/IDAgOiBtYXNrVGV4dHVyZS5nZXQoKSk7CiAgICAg fQorCisgICAgaWYgKG1fY3VycmVudENvbnRlbnQuY29udGVudFR5cGUgPT0gTWVkaWFDb250ZW50 VHlwZSAmJiBtX2N1cnJlbnRDb250ZW50Lm1lZGlhKSB7CisgICAgICAgIGlmIChtX3N0YXRlLnJl cGxpY2FMYXllciAmJiAhb3B0aW9ucy5pc1N1cmZhY2UpCisgICAgICAgICAgICBtX2N1cnJlbnRD b250ZW50Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRleHR1cmVNYXBwZXIs IHRhcmdldFJlY3QsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBUcmFuc2Zvcm1hdGlvbk1hdHJpeChtX3RyYW5zZm9ybXMudGFyZ2V0KS5t dWx0aXBseShtX3N0YXRlLnJlcGxpY2FMYXllci0+bV90cmFuc2Zvcm1zLmxvY2FsKSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9wYWNp dHkgKiBtX3N0YXRlLnJlcGxpY2FMYXllci0+bV9vcGFjaXR5LAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVwbGljYU1hc2tUZXh0dXJl ID8gcmVwbGljYU1hc2tUZXh0dXJlLmdldCgpIDogbWFza1RleHR1cmUuZ2V0KCkpOworICAgICAg ICBtX2N1cnJlbnRDb250ZW50Lm1lZGlhLT5wYWludFRvVGV4dHVyZU1hcHBlcihvcHRpb25zLnRl eHR1cmVNYXBwZXIsIHRhcmdldFJlY3QsIG1fdHJhbnNmb3Jtcy50YXJnZXQsIG9wYWNpdHksIG9w dGlvbnMuaXNTdXJmYWNlID8gMCA6IG1hc2tUZXh0dXJlLmdldCgpKTsKKyAgICB9CiB9CiAKIGlu dCBUZXh0dXJlTWFwcGVyTm9kZTo6Y29tcGFyZUdyYXBoaWNzTGF5ZXJzWlZhbHVlKGNvbnN0IHZv aWQqIGEsIGNvbnN0IHZvaWQqIGIpCi0tIAoxLjcuNS40Cgo=