32059 2009-12-02 01:38:00 -0800 [Qt] Plugins: Force windowless mode when there is no native window handle 2010-12-07 12:04:21 -0800 1 1 1 Unclassified WebKit Plug-ins 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 girish girish hausmann hui_huang kenneth laszlo.gombos ostap73 tofu.linden webkit.review.bot zecke oldest_to_newest 167926 0 girish 2009-12-02 01:38:00 -0800 When flash is instantiated in windowed mode, it requires a native window handle and will not paint to an offscreen pixmap on Windows and X11. A solution on X11 is to implement composited plugins (https://bugs.webkit.org/show_bug.cgi?id=31232). On Windows, presumably this can be done by creating a fake window and grabbing it's contents. All that seems to be a lot of work compared :-) For flash atleast, we can force it into windowless mode by injecting wmode transparent/opaque. 167931 1 44136 girish 2009-12-02 01:58:26 -0800 Created attachment 44136 Inject wmode=opaque * opaque is injected for comatibility with windowed mode (as opposed to transparent) 167933 2 webkit.review.bot 2009-12-02 02:02:50 -0800 Attachment 44136 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/plugins/PluginView.cpp:73: Alphabetical sorting problem. [build/include_order] [4] Total errors found: 1 167958 3 kenneth 2009-12-02 04:49:26 -0800 This was my original idea :-) I think Antonio said that Fennec did that, but I know it is not doing that anymore. Would be nice to find out why 167971 4 girish 2009-12-02 06:39:15 -0800 (In reply to comment #3) > This was my original idea :-) I think Antonio said that Fennec did that, but I > know it is not doing that anymore. Would be nice to find out why I left a comment in #31232 about that (pasted below) Per my understanding, the approach of using xcomposite was chosen by fennec, only because they didn't have flash 10 on ARM (flash 10 added support for windowless mode). See https://bugzilla.mozilla.org/show_bug.cgi?id=442109#c10 and https://bugzilla.mozilla.org/show_bug.cgi?id=442109#c11 168411 5 girish 2009-12-03 08:14:39 -0800 Simon, comments? zecke and kenneth seem to agree. 168947 6 44136 hausmann 2009-12-04 15:12:40 -0800 Comment on attachment 44136 Inject wmode=opaque I agree with the approach, but I have two comments about the implementation: 1) The proposed patch appends the wmode parameter. Are you sure that flash will always use the last wmode parameter if it's specified? Wouldn't it be better to _replace_ the value of an existing wmode if specified and only otherwise append? 2) I think this kind of quirk doesn't belong into PluginView.cpp but rather into FrameLoaderClientQt::createPlugin. IMHO it's much more specific to the needs of Qt (with its QGraphicsView) than to the implementation of the spec or the needs of the other ports. 169230 7 girish 2009-12-07 03:16:30 -0800 (In reply to comment #6) > (From update of attachment 44136 [details]) > I agree with the approach, but I have two comments about the implementation: > > 1) The proposed patch appends the wmode parameter. Are you sure that flash will > always use the last wmode parameter if it's specified? Wouldn't it be better to > _replace_ the value of an existing wmode if specified and only otherwise > append? > I have tested this on Windows and Linux. It does seem to respect the value that is provided at the end. > 2) I think this kind of quirk doesn't belong into PluginView.cpp but rather > into FrameLoaderClientQt::createPlugin. IMHO it's much more specific to the > needs of Qt (with its QGraphicsView) than to the implementation of the spec or > the needs of the other ports. Great point. Totally agree. 169231 8 44397 girish 2009-12-07 03:19:16 -0800 Created attachment 44397 Inject wmode=opaque (2) Simon, I will commit only after testing on the Mac but if you can review in meantime that will be good :-) 169232 9 webkit.review.bot 2009-12-07 03:21:21 -0800 style-queue ran check-webkit-style on attachment 44397 without any errors. 169235 10 44397 hausmann 2009-12-07 03:34:44 -0800 Comment on attachment 44397 Inject wmode=opaque (2) r=me, although I would still prefer code that would replace the value of an existing wmode parameter and only append if there isn't any present. Just to make it more robust :) Thanks Girish for working on this! 169246 11 44400 girish 2009-12-07 04:31:16 -0800 Created attachment 44400 Inject wmode=opaque (3) Make simon happy :-) 169247 12 webkit.review.bot 2009-12-07 04:32:58 -0800 style-queue ran check-webkit-style on attachment 44400 without any errors. 169249 13 44400 hausmann 2009-12-07 04:34:17 -0800 Comment on attachment 44400 Inject wmode=opaque (3) r=me 169282 14 girish 2009-12-07 05:48:11 -0800 Landed in r51759 259035 15 hui_huang 2010-08-02 12:14:48 -0700 Hi Girish and Simon, I'm working on Symbian Flash player integration with QT Webkit and QGraphicsWebView. Your patch 51759 forces Symbian Flash player to run in Windowless mode by default. Since Symbian Flash player works in both window and windowless modes in QGraphicsWebView. We would like to run Flash Plugin in window mode on Symbian by default for performance and specification compliance reasons. Is it possible to disable this implementation for Symbian? Thanks, Hui. 316422 16 ostap73 2010-12-02 14:40:27 -0800 As I understand, your commit completely disables transparent mode for QGraphicsWebView (which is also windowless). Do you have any reason for this? 318377 17 ostap73 2010-12-07 12:04:21 -0800 (In reply to comment #14) > Landed in r51759 Bug related to this change: https://bugs.webkit.org/show_bug.cgi?id=50495 44136 2009-12-02 01:58:26 -0800 2009-12-07 03:19:16 -0800 Inject wmode=opaque patch text/plain 3008 girish Y29tbWl0IDhlZjA0ZDNiZjI4Njc4OTFiOWQ1MmVmZjNkNDhiZjIyMGZjMzZlYzEKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgV2VkIERl YyAyIDE1OjAxOjA4IDIwMDkgKzA1MzAKCiAgICBbUXRdIFBsdWdpbnM6IEZvcmNlIHdpbmRvd2xl c3MgbW9kZSB3aGVuIHRoZXJlIGlzIG5vIG5hdGl2ZSB3aW5kb3cgaGFuZGxlCiAgICAKICAgIElu amVjdCB3bW9kZT1vcGFxdWUgd2hlbiBpbnN0YW50aWF0aW5nIHRoZSBwbHVnaW4gYW5kIHRoZSB3 ZWIgdmlldyBpcyBub3QgYmFja2VkCiAgICBieSBhIG5hdGl2ZSB3aW5kb3cgaGFuZGxlLgogICAg CiAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIwNTkKCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9XZWJDb3JlL3BsdWdpbnMv UGx1Z2luVmlldy5jcHAKaW5kZXggYWMyMTBmNi4uM2ZlNGJkYyAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9wbHVnaW5zL1BsdWdpblZpZXcuY3BwCisrKyBiL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3 LmNwcApAQCAtNjgsNyArNjgsMTAgQEAKICNpbmNsdWRlIDxydW50aW1lL0pTTG9jay5oPgogI2lu Y2x1ZGUgPHJ1bnRpbWUvSlNWYWx1ZS5oPgogI2luY2x1ZGUgPHd0Zi9BU0NJSUNUeXBlLmg+Ci0K KyNpZiBQTEFURk9STShRVCkKKyNpbmNsdWRlIDxRV2lkZ2V0PgorI2luY2x1ZGUgIlFXZWJQYWdl Q2xpZW50LmgiCisjZW5kaWYKIHVzaW5nIEpTQzo6RXhlY1N0YXRlOwogdXNpbmcgSlNDOjpKU0xv Y2s7CiB1c2luZyBKU0M6OkpTT2JqZWN0OwpAQCAtNzU3LDkgKzc2MCwxMSBAQCB2b2lkIFBsdWdp blZpZXc6OnNldFBhcmFtZXRlcnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIHBhcmFtTmFtZXMsIGNv bnN0IFZlY3RvcjxTdAogCiAgICAgdW5zaWduZWQgc2l6ZSA9IHBhcmFtTmFtZXMuc2l6ZSgpOwog ICAgIHVuc2lnbmVkIHBhcmFtQ291bnQgPSAwOworICAgIGNvbnN0IGJvb2wgZm9yY2VXaW5kb3ds ZXNzTW9kZUZvckZsYXNoID0gc2hvdWxkRm9yY2VXaW5kb3dsZXNzTW9kZUZvckZsYXNoKCk7CiAK LSAgICBtX3BhcmFtTmFtZXMgPSByZWludGVycHJldF9jYXN0PGNoYXIqKj4oZmFzdE1hbGxvYyhz aXplb2YoY2hhciopICogc2l6ZSkpOwotICAgIG1fcGFyYW1WYWx1ZXMgPSByZWludGVycHJldF9j YXN0PGNoYXIqKj4oZmFzdE1hbGxvYyhzaXplb2YoY2hhciopICogc2l6ZSkpOworICAgIGNvbnN0 IGludCBtYXhQYXJhbUNvdW50ID0gZm9yY2VXaW5kb3dsZXNzTW9kZUZvckZsYXNoID8gc2l6ZSsx IDogc2l6ZTsKKyAgICBtX3BhcmFtTmFtZXMgPSByZWludGVycHJldF9jYXN0PGNoYXIqKj4oZmFz dE1hbGxvYyhzaXplb2YoY2hhciopICogKG1heFBhcmFtQ291bnQpKSk7CisgICAgbV9wYXJhbVZh bHVlcyA9IHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcioqPihmYXN0TWFsbG9jKHNpemVvZihjaGFyKikg KiAobWF4UGFyYW1Db3VudCkpKTsKIAogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXpl OyBpKyspIHsKICAgICAgICAgaWYgKG1fcGx1Z2luLT5xdWlya3MoKS5jb250YWlucyhQbHVnaW5R dWlya1JlbW92ZVdpbmRvd2xlc3NWaWRlb1BhcmFtKSAmJiBlcXVhbElnbm9yaW5nQ2FzZShwYXJh bU5hbWVzW2ldLCAid2luZG93bGVzc3ZpZGVvIikpCkBAIC03NzQsNiArNzc5LDEyIEBAIHZvaWQg UGx1Z2luVmlldzo6c2V0UGFyYW1ldGVycyhjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFyYW1OYW1l cywgY29uc3QgVmVjdG9yPFN0CiAgICAgICAgIHBhcmFtQ291bnQrKzsKICAgICB9CiAKKyAgICBp ZiAoZm9yY2VXaW5kb3dsZXNzTW9kZUZvckZsYXNoKSB7CisgICAgICAgIG1fcGFyYW1OYW1lc1tw YXJhbUNvdW50XSA9IGNyZWF0ZVVURjhTdHJpbmcoIndtb2RlIik7CisgICAgICAgIG1fcGFyYW1W YWx1ZXNbcGFyYW1Db3VudF0gPSBjcmVhdGVVVEY4U3RyaW5nKCJvcGFxdWUiKTsKKyAgICAgICAg cGFyYW1Db3VudCsrOworICAgIH0KKwogICAgIG1fcGFyYW1Db3VudCA9IHBhcmFtQ291bnQ7CiB9 CiAKQEAgLTEyNDEsNCArMTI1MiwxNSBAQCBOb2RlKiBQbHVnaW5WaWV3Ojpub2RlKCkgY29uc3QK ICAgICByZXR1cm4gbV9lbGVtZW50OwogfQogCitib29sIFBsdWdpblZpZXc6OnNob3VsZEZvcmNl V2luZG93bGVzc01vZGVGb3JGbGFzaCgpIGNvbnN0Cit7CisjaWYgUExBVEZPUk0oUVQpCisgICAg UVdlYlBhZ2VDbGllbnQqIGNsaWVudCA9IG1fcGFyZW50RnJhbWUtPnZpZXcoKS0+aG9zdFdpbmRv dygpLT5wbGF0Zm9ybVBhZ2VDbGllbnQoKTsKKyAgICBjb25zdCBib29sIHBhcmVudEhhc05hdGl2 ZVdpbmRvd0hhbmRsZSA9IGNsaWVudCAmJiBxb2JqZWN0X2Nhc3Q8UVdpZGdldCo+KGNsaWVudC0+ cGx1Z2luUGFyZW50KCkpOworICAgIHJldHVybiBtX21pbWVUeXBlID09ICJhcHBsaWNhdGlvbi94 LXNob2Nrd2F2ZS1mbGFzaCIgJiYgIXBhcmVudEhhc05hdGl2ZVdpbmRvd0hhbmRsZTsKKyNlbHNl CisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGx1Z2lucy9QbHVnaW5WaWV3LmggYi9XZWJDb3JlL3BsdWdp bnMvUGx1Z2luVmlldy5oCmluZGV4IDhmOThiMmMuLjdmY2IxN2UgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGx1Z2lucy9QbHVnaW5WaWV3LmgKKysrIGIvV2ViQ29yZS9wbHVnaW5zL1BsdWdpblZpZXcu aApAQCAtMzQwLDYgKzM0MCw4IEBAIHByaXZhdGU6CiAgICAgICAgIFBvaW50IGdsb2JhbE1vdXNl UG9zRm9yUGx1Z2luKCkgY29uc3Q7CiAjZW5kaWYKIAorICAgICAgICBib29sIHNob3VsZEZvcmNl V2luZG93bGVzc01vZGVGb3JGbGFzaCgpIGNvbnN0OworCiAjaWYgZGVmaW5lZChRX1dTX1gxMSkg JiYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgICAgIGJvb2wgbV9oYXNQZW5kaW5n R2VvbWV0cnlDaGFuZ2U7CiAgICAgICAgIFBpeG1hcCBtX2RyYXdhYmxlOwo= 44397 2009-12-07 03:19:16 -0800 2009-12-07 04:31:16 -0800 Inject wmode=opaque (2) foo text/plain 2715 girish Y29tbWl0IGI0ZjMyYWZiNDFmODNlNzBlMGY5ZmIzYWU5OGFmMGZlNjhiZWQ2NDQKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgTW9uIERl YyA3IDAyOjIwOjMxIDIwMDkgKzA1MzAKCiAgICBbUXRdIFBsdWdpbnM6IEZvcmNlIHdpbmRvd2xl c3MgbW9kZSB3aGVuIHRoZXJlIGlzIG5vIG5hdGl2ZSB3aW5kb3cgaGFuZGxlCiAgICAKICAgIElu amVjdCB3bW9kZT1vcGFxdWUgd2hpbGUgaW5zdGFudGlhdGluZyB0aGUgcGx1Z2luIGZvciB0aGUg Y2FzZSB3aGVuIHRoZQogICAgd2VicGFnZSBpcyBub3QgYmFja2VkIGJ5IGEgbmF0aXZlIHdpbmRv dyBoYW5kbGUuCiAgICAKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMjA1OQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IDllZjEzZjEuLjY0NDY4YTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTEy LTA3ICBHaXJpc2ggUmFtYWtyaXNobmFuICA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUGx1Z2luczog Rm9yY2Ugd2luZG93bGVzcyBtb2RlIHdoZW4gdGhlcmUgaXMgbm8gbmF0aXZlIHdpbmRvdyBoYW5k bGUKKyAgICAgICAgCisgICAgICAgIEluamVjdCB3bW9kZT1vcGFxdWUgd2hpbGUgaW5zdGFudGlh dGluZyB0aGUgcGx1Z2luIGZvciB0aGUgY2FzZSB3aGVuIHRoZQorICAgICAgICB3ZWJwYWdlIGlz IG5vdCBiYWNrZWQgYnkgYSBuYXRpdmUgd2luZG93IGhhbmRsZS4KKyAgICAgICAgCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjA1OQorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVQbHVnaW4pOgorCiAyMDA5LTEyLTA0ICBK b2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggNDU5M2ZjNS4uOTJj MTRiNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcApAQCAtNCw2ICs0LDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwOSBOb2tpYSBDb3Jw b3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAqIENvcHlyaWdodCAoQykgMjAw OCBDb2xsYWJvcmEgTHRkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ295cHJpZ2h0IChDKSAy MDA4IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCisgKiBDb3lwcmlnaHQgKEMpIDIwMDkgR2ly aXNoIFJhbWFrcmlzaG5hbiA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgogICoKICAqIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgpAQCAtMTMwMCw4ICsxMzAxLDE5IEBAIFBhc3NSZWZQdHI8V2lkZ2V0 PiBGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYgcGx1Z2lu U2l6ZSwKICAgICAgICAgICAgIC8vIEZJWE1FOiBtYWtlIHRoaW5ncyB3b3JrIGZvciB3aWRnZXRs ZXNzIHBsdWdpbnMgYXMgd2VsbAogICAgICAgICAgICAgZGVsZXRlIG9iamVjdDsKICAgICB9IGVs c2UgeyAvLyBOUEFQSSBQbHVnaW5zCisgICAgICAgIFZlY3RvcjxTdHJpbmc+IHBhcmFtcyA9IHBh cmFtTmFtZXM7CisgICAgICAgIFZlY3RvcjxTdHJpbmc+IHZhbHVlcyA9IHBhcmFtVmFsdWVzOwor ICAgICAgICBpZiAobWltZVR5cGUgPT0gImFwcGxpY2F0aW9uL3gtc2hvY2t3YXZlLWZsYXNoIikg eworICAgICAgICAgICAgUVdlYlBhZ2VDbGllbnQqIGNsaWVudCA9IG1fd2ViRnJhbWUtPnBhZ2Uo KS0+ZC0+Y2xpZW50OworICAgICAgICAgICAgaWYgKCFjbGllbnQgfHwgIXFvYmplY3RfY2FzdDxR V2lkZ2V0Kj4oY2xpZW50LT5wbHVnaW5QYXJlbnQoKSkpIHsKKyAgICAgICAgICAgICAgICAvLyBp bmplY3Qgd21vZGU9b3BhcXVlIHdoZW4gdGhlcmUgaXMgbm8gY2xpZW50IG9yIHRoZSBjbGllbnQg aXMgbm90IGEgUVdlYlZpZXcKKyAgICAgICAgICAgICAgICBwYXJhbXMuYXBwZW5kKCJ3bW9kZSIp OworICAgICAgICAgICAgICAgIHZhbHVlcy5hcHBlbmQoIm9wYXF1ZSIpOworICAgICAgICAgICAg fQorICAgICAgICB9CisKICAgICAgICAgUmVmUHRyPFBsdWdpblZpZXc+IHBsdWdpblZpZXcgPSBQ bHVnaW5WaWV3OjpjcmVhdGUobV9mcmFtZSwgcGx1Z2luU2l6ZSwgZWxlbWVudCwgdXJsLAotICAg ICAgICAgICAgcGFyYW1OYW1lcywgcGFyYW1WYWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkp OworICAgICAgICAgICAgcGFyYW1zLCB2YWx1ZXMsIG1pbWVUeXBlLCBsb2FkTWFudWFsbHkpOwog ICAgICAgICByZXR1cm4gcGx1Z2luVmlldzsKICAgICB9CiAK 44400 2009-12-07 04:31:16 -0800 2009-12-07 04:34:17 -0800 Inject wmode=opaque (3) bar text/plain 2899 girish Y29tbWl0IGY1Y2I1N2FmNWU3MWFiOGRiMTFlYTNlZDI3MGRiZWU1NDY3MzdhMmIKQXV0aG9yOiBH aXJpc2ggUmFtYWtyaXNobmFuIDxnaXJpc2hAZm9yd2FyZGJpYXMuaW4+CkRhdGU6ICAgTW9uIERl YyA3IDAyOjIwOjMxIDIwMDkgKzA1MzAKCiAgICBbUXRdIFBsdWdpbnM6IEZvcmNlIHdpbmRvd2xl c3MgbW9kZSB3aGVuIHRoZXJlIGlzIG5vIG5hdGl2ZSB3aW5kb3cgaGFuZGxlCiAgICAKICAgIElu amVjdCB3bW9kZT1vcGFxdWUgd2hpbGUgaW5zdGFudGlhdGluZyB0aGUgcGx1Z2luIGZvciB0aGUg Y2FzZSB3aGVuIHRoZQogICAgd2VicGFnZSBpcyBub3QgYmFja2VkIGJ5IGEgbmF0aXZlIHdpbmRv dyBoYW5kbGUuCiAgICAKICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zMjA1OQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9XZWJLaXQvcXQvQ2hh bmdlTG9nCmluZGV4IDllZjEzZjEuLjY0NDY4YTYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9xdC9DaGFu Z2VMb2cKKysrIGIvV2ViS2l0L3F0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDA5LTEy LTA3ICBHaXJpc2ggUmFtYWtyaXNobmFuICA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gUGx1Z2luczog Rm9yY2Ugd2luZG93bGVzcyBtb2RlIHdoZW4gdGhlcmUgaXMgbm8gbmF0aXZlIHdpbmRvdyBoYW5k bGUKKyAgICAgICAgCisgICAgICAgIEluamVjdCB3bW9kZT1vcGFxdWUgd2hpbGUgaW5zdGFudGlh dGluZyB0aGUgcGx1Z2luIGZvciB0aGUgY2FzZSB3aGVuIHRoZQorICAgICAgICB3ZWJwYWdlIGlz IG5vdCBiYWNrZWQgYnkgYSBuYXRpdmUgd2luZG93IGhhbmRsZS4KKyAgICAgICAgCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjA1OQorCisgICAgICAg ICogV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVQbHVnaW4pOgorCiAyMDA5LTEyLTA0ICBK b2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAgYi9XZWJLaXQvcXQv V2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRRdC5jcHAKaW5kZXggNDU5M2ZjNS4uM2Mz MGFiNSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xp ZW50UXQuY3BwCisrKyBiL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNsaWVu dFF0LmNwcApAQCAtNCw2ICs0LDcgQEAKICAqIENvcHlyaWdodCAoQykgMjAwOSBOb2tpYSBDb3Jw b3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAqIENvcHlyaWdodCAoQykgMjAw OCBDb2xsYWJvcmEgTHRkLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ295cHJpZ2h0IChDKSAy MDA4IEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyCisgKiBDb3lwcmlnaHQgKEMpIDIwMDkgR2ly aXNoIFJhbWFrcmlzaG5hbiA8Z2lyaXNoQGZvcndhcmRiaWFzLmluPgogICoKICAqIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgKgpAQCAtMTMwMCw4ICsxMzAxLDIzIEBAIFBhc3NSZWZQdHI8V2lkZ2V0 PiBGcmFtZUxvYWRlckNsaWVudFF0OjpjcmVhdGVQbHVnaW4oY29uc3QgSW50U2l6ZSYgcGx1Z2lu U2l6ZSwKICAgICAgICAgICAgIC8vIEZJWE1FOiBtYWtlIHRoaW5ncyB3b3JrIGZvciB3aWRnZXRs ZXNzIHBsdWdpbnMgYXMgd2VsbAogICAgICAgICAgICAgZGVsZXRlIG9iamVjdDsKICAgICB9IGVs c2UgeyAvLyBOUEFQSSBQbHVnaW5zCisgICAgICAgIFZlY3RvcjxTdHJpbmc+IHBhcmFtcyA9IHBh cmFtTmFtZXM7CisgICAgICAgIFZlY3RvcjxTdHJpbmc+IHZhbHVlcyA9IHBhcmFtVmFsdWVzOwor ICAgICAgICBpZiAobWltZVR5cGUgPT0gImFwcGxpY2F0aW9uL3gtc2hvY2t3YXZlLWZsYXNoIikg eworICAgICAgICAgICAgUVdlYlBhZ2VDbGllbnQqIGNsaWVudCA9IG1fd2ViRnJhbWUtPnBhZ2Uo KS0+ZC0+Y2xpZW50OworICAgICAgICAgICAgaWYgKCFjbGllbnQgfHwgIXFvYmplY3RfY2FzdDxR V2lkZ2V0Kj4oY2xpZW50LT5wbHVnaW5QYXJlbnQoKSkpIHsKKyAgICAgICAgICAgICAgICAvLyBp bmplY3Qgd21vZGU9b3BhcXVlIHdoZW4gdGhlcmUgaXMgbm8gY2xpZW50IG9yIHRoZSBjbGllbnQg aXMgbm90IGEgUVdlYlZpZXcKKyAgICAgICAgICAgICAgICBzaXplX3Qgd21vZGVJbmRleCA9IHBh cmFtcy5maW5kKCJ3bW9kZSIpOworICAgICAgICAgICAgICAgIGlmICh3bW9kZUluZGV4ID09IC0x KSB7CisgICAgICAgICAgICAgICAgICAgIHBhcmFtcy5hcHBlbmQoIndtb2RlIik7CisgICAgICAg ICAgICAgICAgICAgIHZhbHVlcy5hcHBlbmQoIm9wYXF1ZSIpOworICAgICAgICAgICAgICAgIH0g ZWxzZQorICAgICAgICAgICAgICAgICAgICB2YWx1ZXNbd21vZGVJbmRleF0gPSAib3BhcXVlIjsK KyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCiAgICAgICAgIFJlZlB0cjxQbHVnaW5WaWV3PiBw bHVnaW5WaWV3ID0gUGx1Z2luVmlldzo6Y3JlYXRlKG1fZnJhbWUsIHBsdWdpblNpemUsIGVsZW1l bnQsIHVybCwKLSAgICAgICAgICAgIHBhcmFtTmFtZXMsIHBhcmFtVmFsdWVzLCBtaW1lVHlwZSwg bG9hZE1hbnVhbGx5KTsKKyAgICAgICAgICAgIHBhcmFtcywgdmFsdWVzLCBtaW1lVHlwZSwgbG9h ZE1hbnVhbGx5KTsKICAgICAgICAgcmV0dXJuIHBsdWdpblZpZXc7CiAgICAgfQogCg==