30462 2009-10-16 14:40:13 -0700 MediaPlayer doesn't set properties on new privates 2009-10-26 19:42:59 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 0 otte webkit-unassigned commit-queue eric.carlson eric oldest_to_newest 155252 0 otte 2009-10-16 14:40:13 -0700 When constructing a new MediaPlayerPrivate object, the MediaPlayer does not set properties like rate, volume, visible on the private instance, so the instance will use default values, which might be wrong. I'm not sure what the best way to handle them is - add them to the constructor of the private objects or provide a getter on the MediaPlayer objects so the privates can just query them? I'm also not sure what the best way to test this is since the MediaElement doesn't know that the private has wrong values. 155253 1 otte 2009-10-16 14:42:12 -0700 I'm just seeing there is getters already, so it looks like this is only an issue with the GStreamer elements. 156869 2 eric.carlson 2009-10-22 06:31:24 -0700 > I'm just seeing there is getters already, so it looks like this is only an > issue with the GStreamer elements. Agreed, it is the responsibility of the media engine to query the element's state when it is instantiated. 157614 3 41825 otte 2009-10-25 13:27:36 -0700 Created attachment 41825 patch 157645 4 41825 gustavo 2009-10-25 17:36:17 -0700 Comment on attachment 41825 patch > LOG_VERBOSE(Media, "Seek: %" GST_TIME_FORMAT, GST_TIME_ARGS(sec)); > - if (!gst_element_seek( m_playBin, m_rate, > + if (!gst_element_seek( m_playBin, m_player->rate(), ^ You could take the oportunity to fix this weird space here =). > - g_object_set(G_OBJECT(m_playBin), "mute", mute, NULL); > + g_object_set(G_OBJECT(m_playBin), "volume", (double) volume, NULL); You should use static_cast<double>() here, mind the space. > @@ -673,12 +657,11 @@ void MediaPlayerPrivate::paint(GraphicsContext* context, const IntRect& rect) > > // paint the rectangle on the context and draw the surface inside. > cairo_translate(cr, rect.x() + gapWidth, rect.y() + gapHeight); > - cairo_rectangle(cr, 0, 0, rect.width(), rect.height()); > cairo_scale(cr, doublePixelAspectRatioNumerator / doublePixelAspectRatioDenominator, > doublePixelAspectRatioDenominator / doublePixelAspectRatioNumerator); > cairo_scale(cr, scale, scale); > cairo_set_source_surface(cr, src, 0, 0); > - cairo_fill(cr); > + cairo_paint(cr); > cairo_restore(cr); These changes look unrelated, can they go in a separate patch? > - void setMuted(bool); Just so it's crystal clear: this is being removed because the mute logic is already handled by HTMLMediaElement? I'll say r- mainly because of the unrelated changes above, but otherwise looks fine to me, so should be good to land after fixing the nits. 157737 5 41861 otte 2009-10-26 04:44:08 -0700 Created attachment 41861 patch v2 Here's an updated patch. Sorry about the cairo_paint() - I'll file a separate bug for that. I've had a look and setMuted() is gone from the other MediaPlayerPrivate implementations. The HTMLMediaElement takes care of it these days. 157972 6 41861 gustavo 2009-10-26 15:37:56 -0700 Comment on attachment 41861 patch v2 Thanks! 157986 7 41861 commit-queue 2009-10-26 15:58:11 -0700 Comment on attachment 41861 patch v2 Rejecting patch 41861 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--quiet', '--exit-after-n-failures=1']" exit_code: 1 Running build-dumprendertree Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 11520 test cases. svg/css/getComputedStyle-basic.xhtml -> failed Exiting early after 1 failures. 9845 tests run. 317.97s total testing time 9844 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 6 test cases (<1%) had stderr output 158007 8 41861 eric 2009-10-26 16:19:40 -0700 Comment on attachment 41861 patch v2 This failure looks unrelated. Not sure what's going on yet. 158010 9 eric 2009-10-26 16:23:45 -0700 It's a real failure, but not your fault. The bots are just way behind. bug 30098. 158064 10 41861 commit-queue 2009-10-26 19:42:55 -0700 Comment on attachment 41861 patch v2 Clearing flags on attachment: 41861 Committed r50122: <http://trac.webkit.org/changeset/50122> 158065 11 commit-queue 2009-10-26 19:42:59 -0700 All reviewed patches have been landed. Closing bug. 41825 2009-10-25 13:27:36 -0700 2009-10-26 04:44:08 -0700 patch diff text/plain 6144 otte Y29tbWl0IDliZjFmMDMzZjM4NzBjYzY4NTBlYjk0MWJiNDQzNjM1MTFjNmU0YTgKQXV0aG9yOiBC ZW5qYW1pbiBPdHRlIDxvdHRlQGdub21lLm9yZz4KRGF0ZTogICBTdW4gT2N0IDI1IDIwOjA5OjI2 IDIwMDkgKzAxMDAKCiAgICBEb24ndCBzdG9yZSBwcm9wZXJ0aWVzIGluIHRoZSBNZWRpYVBsYXll clByaXZhdGUgY2xhc3MKICAgIAogICAgQWNjZXNzIHRoZW0gdmlhIHRoZSBNZWRpYVBsYXllciBj bGFzcyBpbnN0ZWFkLgogICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMwNDYyCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA4YmFkMjg4Li5mMGRhNDk4IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTEwLTI1ICBCZW5q YW1pbiBPdHRlICA8b3R0ZUBnbm9tZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3RvcmUgcHJvcGVydGllcyBpbiB0aGUgTWVkaWFQ bGF5ZXJQcml2YXRlIGNsYXNzCisKKyAgICAgICAgQWNjZXNzIHRoZW0gdmlhIHRoZSBNZWRpYVBs YXllciBjbGFzcyBpbnN0ZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzA0NjIKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlOjpNZWRpYVBsYXllclByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlOjpzZWVrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZTo6c2V0Vm9sdW1lKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0 UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OnNldFZpc2libGUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpwYWludCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OmNyZWF0ZUdTVFBsYXlCaW4pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoK KwogMjAwOS0xMC0yMiAgS2Vpc2hpIEhhdHRvcmkgIDxjYXNleS5oYXR0b3JpQGdtYWlsLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKaW5kZXggYmM0ZTBkYy4uMjNlMDU5YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw CkBAIC0xNDAsMTUgKzE0MCwxMiBAQCBNZWRpYVBsYXllclByaXZhdGU6Ok1lZGlhUGxheWVyUHJp dmF0ZShNZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV9wbGF5QmluKDApCiAgICAgLCBtX3Zp ZGVvU2luaygwKQogICAgICwgbV9zb3VyY2UoMCkKLSAgICAsIG1fcmF0ZSgxLjBmKQogICAgICwg bV9lbmRUaW1lKG51bWVyaWNfbGltaXRzPGZsb2F0Pjo6aW5maW5pdHkoKSkKLSAgICAsIG1fdm9s dW1lKDAuNWYpCiAgICAgLCBtX25ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6RW1wdHkpCiAgICAg LCBtX3JlYWR5U3RhdGUoTWVkaWFQbGF5ZXI6OkhhdmVOb3RoaW5nKQogICAgICwgbV9zdGFydGVk UGxheWluZyhmYWxzZSkKICAgICAsIG1faXNTdHJlYW1pbmcoZmFsc2UpCiAgICAgLCBtX3NpemUo SW50U2l6ZSgpKQotICAgICwgbV92aXNpYmxlKHRydWUpCiAgICAgLCBtX2J1ZmZlcigwKQogICAg ICwgbV9wYXVzZWQodHJ1ZSkKICAgICAsIG1fc2Vla2luZyhmYWxzZSkKQEAgLTI2NSw3ICsyNjIs NyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2VlayhmbG9hdCB0aW1lKQogICAgICAgICBy ZXR1cm47CiAKICAgICBMT0dfVkVSQk9TRShNZWRpYSwgIlNlZWs6ICUiIEdTVF9USU1FX0ZPUk1B VCwgR1NUX1RJTUVfQVJHUyhzZWMpKTsKLSAgICBpZiAoIWdzdF9lbGVtZW50X3NlZWsoIG1fcGxh eUJpbiwgbV9yYXRlLAorICAgIGlmICghZ3N0X2VsZW1lbnRfc2VlayggbV9wbGF5QmluLCBtX3Bs YXllci0+cmF0ZSgpLAogICAgICAgICAgICAgR1NUX0ZPUk1BVF9USU1FLAogICAgICAgICAgICAg KEdzdFNlZWtGbGFncykoR1NUX1NFRUtfRkxBR19GTFVTSCksCiAgICAgICAgICAgICBHU1RfU0VF S19UWVBFX1NFVCwgc2VjLApAQCAtMzU1LDIxICszNTIsMTAgQEAgYm9vbCBNZWRpYVBsYXllclBy aXZhdGU6Omhhc0F1ZGlvKCkgY29uc3QKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnNldFZv bHVtZShmbG9hdCB2b2x1bWUpCiB7Ci0gICAgbV92b2x1bWUgPSB2b2x1bWU7Ci0gICAgTE9HX1ZF UkJPU0UoTWVkaWEsICJWb2x1bWUgdG8gJWYiLCB2b2x1bWUpOwotCi0gICAgaWYgKCFtX3BsYXlC aW4pCi0gICAgICAgIHJldHVybjsKLQotICAgIGdfb2JqZWN0X3NldChHX09CSkVDVChtX3BsYXlC aW4pLCAidm9sdW1lIiwgbV92b2x1bWUsIE5VTEwpOwotfQotCi12b2lkIE1lZGlhUGxheWVyUHJp dmF0ZTo6c2V0TXV0ZWQoYm9vbCBtdXRlKQotewogICAgIGlmICghbV9wbGF5QmluKQogICAgICAg ICByZXR1cm47CiAKLSAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgIm11dGUi LCBtdXRlLCBOVUxMKTsKKyAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgInZv bHVtZSIsIChkb3VibGUpIHZvbHVtZSwgTlVMTCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlOjpzZXRSYXRlKGZsb2F0IHJhdGUpCkBAIC0zODIsNyArMzY4LDYgQEAgdm9pZCBNZWRpYVBs YXllclByaXZhdGU6OnNldFJhdGUoZmxvYXQgcmF0ZSkKICAgICBpZiAobV9pc1N0cmVhbWluZykK ICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9yYXRlID0gcmF0ZTsKICAgICBMT0dfVkVSQk9TRShN ZWRpYSwgIlNldCBSYXRlIHRvICVmIiwgcmF0ZSk7CiAgICAgc2VlayhjdXJyZW50VGltZSgpKTsK IH0KQEAgLTYyNyw3ICs2MTIsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0U2l6ZShj b25zdCBJbnRTaXplJiBzaXplKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0VmlzaWJs ZShib29sIHZpc2libGUpCiB7Ci0gICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIH0KIAogdm9pZCBN ZWRpYVBsYXllclByaXZhdGU6OnJlcGFpbnQoKQpAQCAtNjQwLDcgKzYyNCw3IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlOjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IElu dFJlY3QmIHJlY3QpCiAgICAgaWYgKGNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKCFtX3Zpc2libGUpCisgICAgaWYgKCFtX3BsYXllci0+dmlz aWJsZSgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX2J1ZmZlcikKICAgICAgICAgcmV0 dXJuOwpAQCAtNjczLDEyICs2NTcsMTEgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnBhaW50 KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKIAogICAgIC8v IHBhaW50IHRoZSByZWN0YW5nbGUgb24gdGhlIGNvbnRleHQgYW5kIGRyYXcgdGhlIHN1cmZhY2Ug aW5zaWRlLgogICAgIGNhaXJvX3RyYW5zbGF0ZShjciwgcmVjdC54KCkgKyBnYXBXaWR0aCwgcmVj dC55KCkgKyBnYXBIZWlnaHQpOwotICAgIGNhaXJvX3JlY3RhbmdsZShjciwgMCwgMCwgcmVjdC53 aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKICAgICBjYWlyb19zY2FsZShjciwgZG91YmxlUGl4ZWxB c3BlY3RSYXRpb051bWVyYXRvciAvIGRvdWJsZVBpeGVsQXNwZWN0UmF0aW9EZW5vbWluYXRvciwK ICAgICAgICAgICAgICAgICBkb3VibGVQaXhlbEFzcGVjdFJhdGlvRGVub21pbmF0b3IgLyBkb3Vi bGVQaXhlbEFzcGVjdFJhdGlvTnVtZXJhdG9yKTsKICAgICBjYWlyb19zY2FsZShjciwgc2NhbGUs IHNjYWxlKTsKICAgICBjYWlyb19zZXRfc291cmNlX3N1cmZhY2UoY3IsIHNyYywgMCwgMCk7Ci0g ICAgY2Fpcm9fZmlsbChjcik7CisgICAgY2Fpcm9fcGFpbnQoY3IpOwogICAgIGNhaXJvX3Jlc3Rv cmUoY3IpOwogCiAgICAgY2Fpcm9fc3VyZmFjZV9kZXN0cm95KHNyYyk7CkBAIC04MDksNyArNzky LDggQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OmNyZWF0ZUdTVFBsYXlCaW4oU3RyaW5nIHVy bCkKICAgICBnX3NpZ25hbF9jb25uZWN0KGJ1cywgIm1lc3NhZ2UiLCBHX0NBTExCQUNLKG1lZGlh UGxheWVyUHJpdmF0ZU1lc3NhZ2VDYWxsYmFjayksIHRoaXMpOwogICAgIGdzdF9vYmplY3RfdW5y ZWYoYnVzKTsKIAotICAgIGdfb2JqZWN0X3NldChHX09CSkVDVChtX3BsYXlCaW4pLCAidXJpIiwg dXJsLnV0ZjgoKS5kYXRhKCksIE5VTEwpOworICAgIGdfb2JqZWN0X3NldChHX09CSkVDVChtX3Bs YXlCaW4pLCAidXJpIiwgdXJsLnV0ZjgoKS5kYXRhKCksCisgICAgICAgICJ2b2x1bWUiLCBtX3Bs YXllci0+dm9sdW1lKCksIE5VTEwpOwogCiAgICAgbV92aWRlb1NpbmsgPSB3ZWJraXRfdmlkZW9f c2lua19uZXcoKTsKIApAQCAtODE3LDggKzgwMSw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRl OjpjcmVhdGVHU1RQbGF5QmluKFN0cmluZyB1cmwpCiAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJp biwgInZpZGVvLXNpbmsiLCBtX3ZpZGVvU2luaywgTlVMTCk7CiAKICAgICBnX3NpZ25hbF9jb25u ZWN0KG1fdmlkZW9TaW5rLCAicmVwYWludC1yZXF1ZXN0ZWQiLCBHX0NBTExCQUNLKG1lZGlhUGxh eWVyUHJpdmF0ZVJlcGFpbnRDYWxsYmFjayksIHRoaXMpOwotCi0gICAgc2V0Vm9sdW1lKG1fdm9s dW1lKTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCAxMGVlN2RkLi41NGRhNDIw IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuaAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuaApAQCAtNzMsNyArNzMsNiBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKICAgICAgICAgICAgIHZvaWQgc2V0UmF0ZShmbG9hdCk7CiAgICAgICAgICAgICB2 b2lkIHNldFZvbHVtZShmbG9hdCk7Ci0gICAgICAgICAgICB2b2lkIHNldE11dGVkKGJvb2wpOwog CiAgICAgICAgICAgICBpbnQgZGF0YVJhdGUoKSBjb25zdDsKIApAQCAtMTI1LDE2ICsxMjQsMTMg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgR3N0RWxlbWVudCogbV9wbGF5Qmlu OwogICAgICAgICAgICAgR3N0RWxlbWVudCogbV92aWRlb1Npbms7CiAgICAgICAgICAgICBHc3RF bGVtZW50KiBtX3NvdXJjZTsKLSAgICAgICAgICAgIGZsb2F0IG1fcmF0ZTsKICAgICAgICAgICAg IGZsb2F0IG1fZW5kVGltZTsKICAgICAgICAgICAgIGJvb2wgbV9pc0VuZFJlYWNoZWQ7Ci0gICAg ICAgICAgICBkb3VibGUgbV92b2x1bWU7CiAgICAgICAgICAgICBNZWRpYVBsYXllcjo6TmV0d29y a1N0YXRlIG1fbmV0d29ya1N0YXRlOwogICAgICAgICAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5U3Rh dGUgbV9yZWFkeVN0YXRlOwogICAgICAgICAgICAgYm9vbCBtX3N0YXJ0ZWRQbGF5aW5nOwogICAg ICAgICAgICAgbXV0YWJsZSBib29sIG1faXNTdHJlYW1pbmc7CiAgICAgICAgICAgICBJbnRTaXpl IG1fc2l6ZTsKLSAgICAgICAgICAgIGJvb2wgbV92aXNpYmxlOwogICAgICAgICAgICAgR3N0QnVm ZmVyKiBtX2J1ZmZlcjsKIAogICAgICAgICAgICAgYm9vbCBtX3BhdXNlZDsK 41861 2009-10-26 04:44:08 -0700 2009-10-26 19:42:55 -0700 patch v2 diff text/plain 5503 otte Y29tbWl0IGNjMzIwNTcxNjU3Y2Q3YTI1MWE4MDkxZTUyMmNiNzhlODlhMzFiZjIKQXV0aG9yOiBC ZW5qYW1pbiBPdHRlIDxvdHRlQGdub21lLm9yZz4KRGF0ZTogICBNb24gT2N0IDI2IDEwOjQ4OjU4 IDIwMDkgKzAxMDAKCiAgICBEb24ndCBzdG9yZSBwcm9wZXJ0aWVzIGluIHRoZSBNZWRpYVBsYXll clByaXZhdGUgY2xhc3MKICAgIAogICAgQWNjZXNzIHRoZW0gdmlhIHRoZSBNZWRpYVBsYXllciBj bGFzcyBpbnN0ZWFkLgogICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTMwNDYyCgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCBkN2ViNGU5Li44NWNkM2VmIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTEwLTI1ICBCZW5q YW1pbiBPdHRlICA8b3R0ZUBnbm9tZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRG9uJ3Qgc3RvcmUgcHJvcGVydGllcyBpbiB0aGUgTWVkaWFQ bGF5ZXJQcml2YXRlIGNsYXNzCisKKyAgICAgICAgQWNjZXNzIHRoZW0gdmlhIHRoZSBNZWRpYVBs YXllciBjbGFzcyBpbnN0ZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MzA0NjIKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlOjpNZWRpYVBsYXllclByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlOjpzZWVrKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZTo6c2V0Vm9sdW1lKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0 UmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OnNldFZpc2libGUp OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlOjpwYWludCk6CisgICAgICAg IChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGU6OmNyZWF0ZUdTVFBsYXlCaW4pOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaDoK KwogMjAwOS0xMC0yNSAgSGlyb25vcmkgQm9ubyAgPGhib25vQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmlu ZGV4IGQyYjUxNjYuLjc4ZjgxYmQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMTQw LDE1ICsxNDAsMTIgQEAgTWVkaWFQbGF5ZXJQcml2YXRlOjpNZWRpYVBsYXllclByaXZhdGUoTWVk aWFQbGF5ZXIqIHBsYXllcikKICAgICAsIG1fcGxheUJpbigwKQogICAgICwgbV92aWRlb1Npbmso MCkKICAgICAsIG1fc291cmNlKDApCi0gICAgLCBtX3JhdGUoMS4wZikKICAgICAsIG1fZW5kVGlt ZShudW1lcmljX2xpbWl0czxmbG9hdD46OmluZmluaXR5KCkpCi0gICAgLCBtX3ZvbHVtZSgwLjVm KQogICAgICwgbV9uZXR3b3JrU3RhdGUoTWVkaWFQbGF5ZXI6OkVtcHR5KQogICAgICwgbV9yZWFk eVN0YXRlKE1lZGlhUGxheWVyOjpIYXZlTm90aGluZykKICAgICAsIG1fc3RhcnRlZFBsYXlpbmco ZmFsc2UpCiAgICAgLCBtX2lzU3RyZWFtaW5nKGZhbHNlKQogICAgICwgbV9zaXplKEludFNpemUo KSkKLSAgICAsIG1fdmlzaWJsZSh0cnVlKQogICAgICwgbV9idWZmZXIoMCkKICAgICAsIG1fcGF1 c2VkKHRydWUpCiAgICAgLCBtX3NlZWtpbmcoZmFsc2UpCkBAIC0yNjUsNyArMjYyLDcgQEAgdm9p ZCBNZWRpYVBsYXllclByaXZhdGU6OnNlZWsoZmxvYXQgdGltZSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgTE9HX1ZFUkJPU0UoTWVkaWEsICJTZWVrOiAlIiBHU1RfVElNRV9GT1JNQVQsIEdTVF9U SU1FX0FSR1Moc2VjKSk7Ci0gICAgaWYgKCFnc3RfZWxlbWVudF9zZWVrKCBtX3BsYXlCaW4sIG1f cmF0ZSwKKyAgICBpZiAoIWdzdF9lbGVtZW50X3NlZWsobV9wbGF5QmluLCBtX3BsYXllci0+cmF0 ZSgpLAogICAgICAgICAgICAgR1NUX0ZPUk1BVF9USU1FLAogICAgICAgICAgICAgKEdzdFNlZWtG bGFncykoR1NUX1NFRUtfRkxBR19GTFVTSCksCiAgICAgICAgICAgICBHU1RfU0VFS19UWVBFX1NF VCwgc2VjLApAQCAtMzU1LDIxICszNTIsMTAgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGU6Omhh c0F1ZGlvKCkgY29uc3QKIAogdm9pZCBNZWRpYVBsYXllclByaXZhdGU6OnNldFZvbHVtZShmbG9h dCB2b2x1bWUpCiB7Ci0gICAgbV92b2x1bWUgPSB2b2x1bWU7Ci0gICAgTE9HX1ZFUkJPU0UoTWVk aWEsICJWb2x1bWUgdG8gJWYiLCB2b2x1bWUpOwotCi0gICAgaWYgKCFtX3BsYXlCaW4pCi0gICAg ICAgIHJldHVybjsKLQotICAgIGdfb2JqZWN0X3NldChHX09CSkVDVChtX3BsYXlCaW4pLCAidm9s dW1lIiwgbV92b2x1bWUsIE5VTEwpOwotfQotCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0 TXV0ZWQoYm9vbCBtdXRlKQotewogICAgIGlmICghbV9wbGF5QmluKQogICAgICAgICByZXR1cm47 CiAKLSAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgIm11dGUiLCBtdXRlLCBO VUxMKTsKKyAgICBnX29iamVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgInZvbHVtZSIsIHN0 YXRpY19jYXN0PGRvdWJsZT4odm9sdW1lKSwgTlVMTCk7CiB9CiAKIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlOjpzZXRSYXRlKGZsb2F0IHJhdGUpCkBAIC0zODIsNyArMzY4LDYgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGU6OnNldFJhdGUoZmxvYXQgcmF0ZSkKICAgICBpZiAobV9pc1N0cmVhbWlu ZykKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9yYXRlID0gcmF0ZTsKICAgICBMT0dfVkVSQk9T RShNZWRpYSwgIlNldCBSYXRlIHRvICVmIiwgcmF0ZSk7CiAgICAgc2VlayhjdXJyZW50VGltZSgp KTsKIH0KQEAgLTYyNyw3ICs2MTIsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0U2l6 ZShjb25zdCBJbnRTaXplJiBzaXplKQogCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0Vmlz aWJsZShib29sIHZpc2libGUpCiB7Ci0gICAgbV92aXNpYmxlID0gdmlzaWJsZTsKIH0KIAogdm9p ZCBNZWRpYVBsYXllclByaXZhdGU6OnJlcGFpbnQoKQpAQCAtNjQwLDcgKzYyNCw3IEBAIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlOjpwYWludChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEludFJlY3QmIHJlY3QpCiAgICAgaWYgKGNvbnRleHQtPnBhaW50aW5nRGlzYWJsZWQoKSkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgaWYgKCFtX3Zpc2libGUpCisgICAgaWYgKCFtX3BsYXllci0+ dmlzaWJsZSgpKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKCFtX2J1ZmZlcikKICAgICAgICAg cmV0dXJuOwpAQCAtODA4LDcgKzc5Miw4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpjcmVh dGVHU1RQbGF5QmluKFN0cmluZyB1cmwpCiAgICAgZ19zaWduYWxfY29ubmVjdChidXMsICJtZXNz YWdlIiwgR19DQUxMQkFDSyhtZWRpYVBsYXllclByaXZhdGVNZXNzYWdlQ2FsbGJhY2spLCB0aGlz KTsKICAgICBnc3Rfb2JqZWN0X3VucmVmKGJ1cyk7CiAKLSAgICBnX29iamVjdF9zZXQoR19PQkpF Q1QobV9wbGF5QmluKSwgInVyaSIsIHVybC51dGY4KCkuZGF0YSgpLCBOVUxMKTsKKyAgICBnX29i amVjdF9zZXQoR19PQkpFQ1QobV9wbGF5QmluKSwgInVyaSIsIHVybC51dGY4KCkuZGF0YSgpLAor ICAgICAgICAidm9sdW1lIiwgc3RhdGljX2Nhc3Q8ZG91YmxlPihtX3BsYXllci0+dm9sdW1lKCkp LCBOVUxMKTsKIAogICAgIG1fdmlkZW9TaW5rID0gd2Via2l0X3ZpZGVvX3NpbmtfbmV3KCk7CiAK QEAgLTgxNiw4ICs4MDEsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6Y3JlYXRlR1NUUGxh eUJpbihTdHJpbmcgdXJsKQogICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4sICJ2aWRlby1zaW5r IiwgbV92aWRlb1NpbmssIE5VTEwpOwogCiAgICAgZ19zaWduYWxfY29ubmVjdChtX3ZpZGVvU2lu aywgInJlcGFpbnQtcmVxdWVzdGVkIiwgR19DQUxMQkFDSyhtZWRpYVBsYXllclByaXZhdGVSZXBh aW50Q2FsbGJhY2spLCB0aGlzKTsKLQotICAgIHNldFZvbHVtZShtX3ZvbHVtZSk7CiB9CiAKIH0K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggMTBlZTdkZC4uNTRkYTQyMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmgKQEAgLTczLDcgKzczLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAg ICAgICAgICB2b2lkIHNldFJhdGUoZmxvYXQpOwogICAgICAgICAgICAgdm9pZCBzZXRWb2x1bWUo ZmxvYXQpOwotICAgICAgICAgICAgdm9pZCBzZXRNdXRlZChib29sKTsKIAogICAgICAgICAgICAg aW50IGRhdGFSYXRlKCkgY29uc3Q7CiAKQEAgLTEyNSwxNiArMTI0LDEzIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgIEdzdEVsZW1lbnQqIG1fcGxheUJpbjsKICAgICAgICAgICAg IEdzdEVsZW1lbnQqIG1fdmlkZW9TaW5rOwogICAgICAgICAgICAgR3N0RWxlbWVudCogbV9zb3Vy Y2U7Ci0gICAgICAgICAgICBmbG9hdCBtX3JhdGU7CiAgICAgICAgICAgICBmbG9hdCBtX2VuZFRp bWU7CiAgICAgICAgICAgICBib29sIG1faXNFbmRSZWFjaGVkOwotICAgICAgICAgICAgZG91Ymxl IG1fdm9sdW1lOwogICAgICAgICAgICAgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBtX25ldHdv cmtTdGF0ZTsKICAgICAgICAgICAgIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIG1fcmVhZHlTdGF0 ZTsKICAgICAgICAgICAgIGJvb2wgbV9zdGFydGVkUGxheWluZzsKICAgICAgICAgICAgIG11dGFi bGUgYm9vbCBtX2lzU3RyZWFtaW5nOwogICAgICAgICAgICAgSW50U2l6ZSBtX3NpemU7Ci0gICAg ICAgICAgICBib29sIG1fdmlzaWJsZTsKICAgICAgICAgICAgIEdzdEJ1ZmZlciogbV9idWZmZXI7 CiAKICAgICAgICAgICAgIGJvb2wgbV9wYXVzZWQ7Cg==