144969 2015-05-13 13:49:27 -0700 Work around HTMLMediaElement::documentDidResumeFromPageCache being called twice 2015-05-13 14:21:50 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson commit-queue esprehn+autocc kangil.han webkit-bug-importer oldest_to_newest 1094574 0 eric.carlson 2015-05-13 13:49:27 -0700 HTMLMediaElement::documentDidResumeFromPageCache is called twice when a page is restored from the page cache, which causes Document::addPlaybackTargetPickerClient to assert in a debug build and to add the client twice in a release build. 1094576 1 253057 eric.carlson 2015-05-13 13:56:39 -0700 Created attachment 253057 Proposed patch. 1094577 2 webkit-bug-importer 2015-05-13 13:57:34 -0700 <rdar://problem/20942403> 1094578 3 253057 ap 2015-05-13 13:58:28 -0700 Comment on attachment 253057 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=253057&action=review > Source/WebCore/dom/Document.cpp:6556 > - ASSERT(!m_clientToIDMap.contains(&client)); > + if (m_clientToIDMap.contains(&client)) > + return; Seems worth a FIXME with a bug number. 1094585 4 eric.carlson 2015-05-13 14:16:35 -0700 (In reply to comment #3) > Comment on attachment 253057 [details] > Proposed patch. > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253057&action=review > > > Source/WebCore/dom/Document.cpp:6556 > > - ASSERT(!m_clientToIDMap.contains(&client)); > > + if (m_clientToIDMap.contains(&client)) > > + return; > > Seems worth a FIXME with a bug number. Indeed. I filed https://webkit.org/b/144970, will reference it in code. 1094586 5 eric.carlson 2015-05-13 14:21:34 -0700 Committed r184306: https://trac.webkit.org/r184306 253057 2015-05-13 13:56:39 -0700 2015-05-13 14:21:50 -0700 Proposed patch. restore_from_cache_patch.txt text/plain 1171 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NDMwMykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE1LTA1LTEzICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFdvcmsgYXJvdW5kIEhU TUxNZWRpYUVsZW1lbnQ6OmRvY3VtZW50RGlkUmVzdW1lRnJvbVBhZ2VDYWNoZSBiZWluZyBjYWxs ZWQgdHdpY2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0NDk2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogZG9tL0RvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjphZGRQbGF5 YmFja1RhcmdldFBpY2tlckNsaWVudCk6CisKIDIwMTUtMDUtMTMgIEJldGggRGFraW4gIDxiZGFr aW5AYXBwbGUuY29tPgogCiAgICAgICAgIE5lZWQgU1BJIHRvIHNldCB0aGUgb3ZlcmxheSBzY3Jv bGwgYmFyIHN0eWxlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHJldmlzaW9uIDE4NDI4 NikKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTY1NTIsNyArNjU1Miw4IEBAIHZvaWQgRG9jdW1lbnQ6OmFkZFBsYXliYWNrVGFyZ2V0UGlja2Vy Q2wKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVCghbV9jbGll bnRUb0lETWFwLmNvbnRhaW5zKCZjbGllbnQpKTsKKyAgICBpZiAobV9jbGllbnRUb0lETWFwLmNv bnRhaW5zKCZjbGllbnQpKQorICAgICAgICByZXR1cm47CiAKICAgICB1aW50NjRfdCBjb250ZXh0 SWQgPSBuZXh0UGxheWJhY2tUYXJnZXRDbGllbnRDb250ZXh0SWQoKTsKICAgICBtX2NsaWVudFRv SURNYXAuYWRkKCZjbGllbnQsIGNvbnRleHRJZCk7Cg==