54580 2011-02-16 13:11:56 -0800 [chromium] Enable media elements statistics support in chromium 2011-03-03 02:06:10 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 sjl webkit-unassigned commit-queue dglazkov fishd jamesr scherkus webkit.review.bot oldest_to_newest 352286 0 sjl 2011-02-16 13:11:56 -0800 The implementation of media elements has landed in chromium. This patch wires up the webkit and chromium parts. 352296 1 82683 sjl 2011-02-16 13:19:54 -0800 Created attachment 82683 Patch 352303 2 webkit.review.bot 2011-02-16 13:36:31 -0800 Attachment 82683 did not build on chromium: Build output: http://queues.webkit.org/results/7926374 352334 3 sjl 2011-02-16 14:12:58 -0800 cr-* failures due to chromium DEPS needing to be bumped. Will look into this. 352997 4 82828 sjl 2011-02-17 10:11:07 -0800 Created attachment 82828 Patch 352998 5 sjl 2011-02-17 10:11:29 -0800 New patch to kick ews bots. 353286 6 levin 2011-02-17 17:55:44 -0800 +fishd (chromium public change) 353450 7 82828 fishd 2011-02-17 23:41:38 -0800 Comment on attachment 82828 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82828&action=review > Source/WebKit/chromium/public/WebMediaPlayer.h:132 > + virtual unsigned long decodedFrames() const = 0; nit: webkit style is to just use "unsigned" instead of "unsigned long" nit: are "decodedFrames" and "droppedFrames" meant to return counts of {decoded,dropped}Frames? if so, the names of these methods could be improved. as is, it sounds like the methods should be returning sets of frames--one set of decoded frames and one set of dropped frames, but clearly that's not what they do since they return integers. How about one of these names? {count,number}Of{Decoded,Dropped}Frames {decoded,dropped}FrameCount > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:453 > +unsigned long WebMediaPlayerClientImpl::decodedFrames() const looks like the WebCore interfaces have the same naming problem. 353667 8 sjl 2011-02-18 10:45:54 -0800 (In reply to comment #7) > (From update of attachment 82828 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=82828&action=review > > > Source/WebKit/chromium/public/WebMediaPlayer.h:132 > > + virtual unsigned long decodedFrames() const = 0; > > nit: webkit style is to just use "unsigned" instead of "unsigned long" Will fix. > > nit: are "decodedFrames" and "droppedFrames" meant to return counts of {decoded,dropped}Frames? > if so, the names of these methods could be improved. as is, it sounds like the methods should > be returning sets of frames--one set of decoded frames and one set of dropped frames, but clearly > that's not what they do since they return integers. > > How about one of these names? > > {count,number}Of{Decoded,Dropped}Frames > {decoded,dropped}FrameCount I like the second ({decoded,dropped}FrameCount). Note that this is mirrored in the idl (HTML{Video,Media}Element.idl. WebCore/html idl style seems to be to use "unsigned long" rather than "unsigned" though, yes? And the implementation HTML*Element.{cpp,h} is to use "unsigned"? As I introduced this a couple of weeks ago, I think I should change the actual core APIs to match this (nothing depends on this as no port supports this yet). I.e. I will: 1) Change WebCore to reflect the API change. 2) Make the changes to chromium 3) Fix up this patch that wires 1 and 2 together. Sound like a plan? Will cc you on the changes. > > > Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp:453 > > +unsigned long WebMediaPlayerClientImpl::decodedFrames() const > > looks like the WebCore interfaces have the same naming problem. Yup - will fix as detailed above. 353675 9 fishd 2011-02-18 10:53:52 -0800 Sounds good, thanks!! 359163 10 84082 sjl 2011-02-28 10:39:58 -0800 Created attachment 84082 Patch 359164 11 sjl 2011-02-28 10:41:53 -0800 Latest patch includes new naming. Will turn on in chromium (build/features_override.gypi) after this... 359931 12 sjl 2011-03-01 09:13:31 -0800 Ping! :-) 360241 13 sjl 2011-03-01 14:33:14 -0800 Hey Darin - wondering if you could look at this? 360872 14 sjl 2011-03-02 10:05:29 -0800 Hey James - could you take a look at this? 361439 15 84082 commit-queue 2011-03-03 01:33:28 -0800 Comment on attachment 84082 Patch Clearing flags on attachment: 84082 Committed r80215: <http://trac.webkit.org/changeset/80215> 361440 16 commit-queue 2011-03-03 01:33:34 -0800 All reviewed patches have been landed. Closing bug. 361451 17 commit-queue 2011-03-03 02:06:10 -0800 The commit-queue encountered the following flaky tests while processing attachment 84082: http/tests/media/video-load-twice.html bug 51304 (authors: eric.carlson@apple.com and jamesr@chromium.org) The commit-queue is continuing to process your patch. 82683 2011-02-16 13:19:54 -0800 2011-02-17 10:11:04 -0800 Patch bug-54580-20110216131952.patch text/plain 4682 sjl ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggMzc5MmY3YWMzZTUwMTBjNTJiZmQ3ZGE4MjIz ZDY5YjkxMzQ4ZGRjYi4uZmQ3NmIxMDg4YWEzMjVmZmEwMWJjOWEzYjY1MjZlNGFkYmQ4NTEyOSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wMi0xNiAg U3RldmUgTGFjZXkgIDxzamxAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpcmUgdXAgd2Via2l0IG1lZGlhIG1ldHJpY3MgY2hh bmdlcyB0byB0aGUgaW1wbGVtZW50YXRpb24gaW4KKyAgICAgICAgY2hyb21pdW0uCisKKyAgICAg ICAgW2Nocm9taXVtXSBFbmFibGUgbWVkaWEgZWxlbWVudHMgc3VwcG9ydCBpbiBjaHJvbWl1bQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ1ODAKKwor ICAgICAgICAqIGZlYXR1cmVzLmd5cGk6CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVy Lmg6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6ZGVjb2RlZEZyYW1lcyk6CisgICAg ICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6ZHJvcHBlZEZyYW1lcyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6YXVkaW9CeXRlc0RlY29k ZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnZpZGVvQnl0 ZXNEZWNvZGVkKToKKyAgICAgICAgKiBzcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmg6CisK IDIwMTEtMDItMTYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3ODY3OC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vZmVhdHVyZXMuZ3lwaQppbmRleCA4OTQ0ZmRlM2JkYjJiZDA5MmM0ZjAxMDY0MTdiODJmNjhh NWM5OWQzLi5iYWFmMmJlZTNlMjUwZDI0MjgzYzUzZjYzZGE0ZWRhYTJkNjEzN2U1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCkBAIC02NCw2ICs2NCw3IEBACiAgICAgICAgICdF TkFCTEVfSlNDX01VTFRJUExFX1RIUkVBRFM9MCcsCiAgICAgICAgICdFTkFCTEVfTElOS19QUkVG RVRDSD0xJywKICAgICAgICAgJ0VOQUJMRV9NQVRITUw9MCcsCisgICAgICAgICdFTkFCTEVfTUVE SUFfU1RBVElTVElDUz0xJywKICAgICAgICAgJ0VOQUJMRV9NRVRFUl9UQUc9MScsCiAgICAgICAg ICdFTkFCTEVfTk9USUZJQ0FUSU9OUz0xJywKICAgICAgICAgJ0VOQUJMRV9PRkZMSU5FX1dFQl9B UFBMSUNBVElPTlM9MScsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJNZWRpYVBsYXllci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVk aWFQbGF5ZXIuaAppbmRleCA2Y2VjMGY1NDkwZDYxNGE3OGNlNDdkODhjYjU2ZjcwOGIzNGVjMzAx Li4zNzBkYWViMzNiMDdlZDY1MmEyN2JmNGRhNmEzOGJlNzg1ZDc1MjNhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKQEAgLTEyOSw2ICsxMjks MTEgQEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigp IGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIE1vdmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSgpIGNv bnN0ID0gMDsKIAorICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBkZWNvZGVkRnJhbWVzKCkgY29u c3QgPSAwOworICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBkcm9wcGVkRnJhbWVzKCkgY29uc3Qg PSAwOworICAgIHZpcnR1YWwgdW5zaWduZWQgbG9uZyBhdWRpb0J5dGVzRGVjb2RlZCgpIGNvbnN0 ID0gMDsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgdmlkZW9CeXRlc0RlY29kZWQoKSBjb25z dCA9IDA7CisKICAgICAvLyBUaGlzIGZ1bmN0aW9uIHJldHVybnMgYSBwb2ludGVyIHRvIGEgV2Vi VmlkZW9GcmFtZSwgd2hpY2ggaXMKICAgICAvLyBhIFdlYktpdCB3cmFwcGVyIGZvciBhIHZpZGVv IGZyYW1lIGluIGNocm9taXVtLiBUaGlzIHBsYWNlcyBhIGxvY2sKICAgICAvLyBvbiB0aGUgZnJh bWUgaW4gY2hyb21pdW0sIGFuZCBjYWxscyB0byB0aGlzIG1ldGhvZCBzaG91bGQgYWx3YXlzIGJl CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNs aWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJD bGllbnRJbXBsLmNwcAppbmRleCA4NTNjYmNmN2Q4NTExNzRmYWRhZTE4MGMxODhiOWI5YTJiOGU2 ODNjLi5iNDZlMmQyMWMwNTI2NTc2N2ZjNjMyYjJmYjlkMGE1ZjMzM2VhZDVkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5jcHAKQEAgLTQ1MCw2ICs0NTAsMzQgQEAgTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgV2Vi TWVkaWFQbGF5ZXJDbGllbnRJbXBsOjptb3ZpZUxvYWRUeXBlKCkgY29uc3QKICAgICByZXR1cm4g TWVkaWFQbGF5ZXI6OlVua25vd247CiB9CiAKK3Vuc2lnbmVkIGxvbmcgV2ViTWVkaWFQbGF5ZXJD bGllbnRJbXBsOjpkZWNvZGVkRnJhbWVzKCkgY29uc3QKK3sKKyAgICBpZiAobV93ZWJNZWRpYVBs YXllci5nZXQoKSkKKyAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmRlY29kZWRGcmFt ZXMoKTsKKyAgICByZXR1cm4gMDsKK30KKwordW5zaWduZWQgbG9uZyBXZWJNZWRpYVBsYXllckNs aWVudEltcGw6OmRyb3BwZWRGcmFtZXMoKSBjb25zdAoreworICAgIGlmIChtX3dlYk1lZGlhUGxh eWVyLmdldCgpKQorICAgICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+ZHJvcHBlZEZyYW1l cygpOworICAgIHJldHVybiAwOworfQorCit1bnNpZ25lZCBsb25nIFdlYk1lZGlhUGxheWVyQ2xp ZW50SW1wbDo6YXVkaW9CeXRlc0RlY29kZWQoKSBjb25zdAoreworICAgIGlmIChtX3dlYk1lZGlh UGxheWVyLmdldCgpKQorICAgICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+YXVkaW9CeXRl c0RlY29kZWQoKTsKKyAgICByZXR1cm4gMDsKK30KKwordW5zaWduZWQgbG9uZyBXZWJNZWRpYVBs YXllckNsaWVudEltcGw6OnZpZGVvQnl0ZXNEZWNvZGVkKCkgY29uc3QKK3sKKyAgICBpZiAobV93 ZWJNZWRpYVBsYXllci5nZXQoKSkKKyAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPnZp ZGVvQnl0ZXNEZWNvZGVkKCk7CisgICAgcmV0dXJuIDA7Cit9CisKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiBib29sIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6c3VwcG9ydHNB Y2NlbGVyYXRlZFJlbmRlcmluZygpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCmluZGV4IGZjZGIyMTlhMTMw ZmUzNDJjMGM1NDZhZmFmYmNlZWE4NGE1ZDg0NzkuLmQ4NjQwZWQzMmVmYmFiNWUzNGJiYzQwN2Vk YTNjODBhZjdiMGU3NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl Yk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCkBAIC0xMTQsNiArMTE0LDEwIEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgcGFpbnRDdXJyZW50RnJhbWVJbkNvbnRleHQoV2ViQ29yZTo6R3Jh cGhpY3NDb250ZXh0KiwgY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwogICAgIHZpcnR1YWwgYm9v bCBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6 TWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSgpIGNvbnN0OworICAgIHZp cnR1YWwgdW5zaWduZWQgbG9uZyBkZWNvZGVkRnJhbWVzKCkgY29uc3Q7CisgICAgdmlydHVhbCB1 bnNpZ25lZCBsb25nIGRyb3BwZWRGcmFtZXMoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHVuc2lnbmVk IGxvbmcgYXVkaW9CeXRlc0RlY29kZWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxv bmcgdmlkZW9CeXRlc0RlY29kZWQoKSBjb25zdDsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9T SVRJTkcpCiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBj b25zdDsKIAo= 82828 2011-02-17 10:11:07 -0800 2011-02-28 10:39:55 -0800 Patch bug-54580-20110217101106.patch text/plain 4667 sjl ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYmE3ZWJiYTU4MmQ1MGMzMWYxMDk3MGZjOTcy YTE5MzQyODM5MTMxYi4uMDlkNWVjZjg1ZTEzMDAxMGIwZGY0ZjBmM2M1ZDU0Yjg2M2Q2NzJjMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMyBAQAogMjAxMS0wMi0xNyAg U3RldmUgTGFjZXkgIDxzamxAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpcmUgdXAgd2Via2l0IG1lZGlhIG1ldHJpY3MgY2hh bmdlcyB0byB0aGUgaW1wbGVtZW50YXRpb24gaW4KKyAgICAgICAgY2hyb21pdW0uCisKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0NTgwCisKKyAgICAg ICAgKiBmZWF0dXJlcy5neXBpOgorICAgICAgICAqIHB1YmxpYy9XZWJNZWRpYVBsYXllci5oOgor ICAgICAgICAqIHNyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRlY29kZWRGcmFtZXMpOgorICAgICAgICAo V2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRyb3BwZWRGcmFtZXMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmF1ZGlvQnl0ZXNEZWNvZGVkKToK KyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjp2aWRlb0J5dGVzRGVj b2RlZCk6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oOgorCisyMDEx LTAyLTE3ICBTdGV2ZSBMYWNleSAgPHNqbEBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gRmlzaGVyLgogCiAgICAgICAgIFJvbGwgY2hyb21pdW0gZGVwcyB0byA3NTE5 MC4gSW5jbHVkZXMgbmV3IGRlcGVuZGVuY3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vZmVhdHVyZXMuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lw aQppbmRleCA4OTQ0ZmRlM2JkYjJiZDA5MmM0ZjAxMDY0MTdiODJmNjhhNWM5OWQzLi5iYWFmMmJl ZTNlMjUwZDI0MjgzYzUzZjYzZGE0ZWRhYTJkNjEzN2U1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9m ZWF0dXJlcy5neXBpCkBAIC02NCw2ICs2NCw3IEBACiAgICAgICAgICdFTkFCTEVfSlNDX01VTFRJ UExFX1RIUkVBRFM9MCcsCiAgICAgICAgICdFTkFCTEVfTElOS19QUkVGRVRDSD0xJywKICAgICAg ICAgJ0VOQUJMRV9NQVRITUw9MCcsCisgICAgICAgICdFTkFCTEVfTUVESUFfU1RBVElTVElDUz0x JywKICAgICAgICAgJ0VOQUJMRV9NRVRFUl9UQUc9MScsCiAgICAgICAgICdFTkFCTEVfTk9USUZJ Q0FUSU9OUz0xJywKICAgICAgICAgJ0VOQUJMRV9PRkZMSU5FX1dFQl9BUFBMSUNBVElPTlM9MScs CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXll ci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQbGF5ZXIuaAppbmRl eCA2Y2VjMGY1NDkwZDYxNGE3OGNlNDdkODhjYjU2ZjcwOGIzNGVjMzAxLi4zNzBkYWViMzNiMDdl ZDY1MmEyN2JmNGRhNmEzOGJlNzg1ZDc1MjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKQEAgLTEyOSw2ICsxMjksMTEgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNvbnN0ID0gMDsKICAg ICB2aXJ0dWFsIE1vdmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSgpIGNvbnN0ID0gMDsKIAorICAg IHZpcnR1YWwgdW5zaWduZWQgbG9uZyBkZWNvZGVkRnJhbWVzKCkgY29uc3QgPSAwOworICAgIHZp cnR1YWwgdW5zaWduZWQgbG9uZyBkcm9wcGVkRnJhbWVzKCkgY29uc3QgPSAwOworICAgIHZpcnR1 YWwgdW5zaWduZWQgbG9uZyBhdWRpb0J5dGVzRGVjb2RlZCgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0 dWFsIHVuc2lnbmVkIGxvbmcgdmlkZW9CeXRlc0RlY29kZWQoKSBjb25zdCA9IDA7CisKICAgICAv LyBUaGlzIGZ1bmN0aW9uIHJldHVybnMgYSBwb2ludGVyIHRvIGEgV2ViVmlkZW9GcmFtZSwgd2hp Y2ggaXMKICAgICAvLyBhIFdlYktpdCB3cmFwcGVyIGZvciBhIHZpZGVvIGZyYW1lIGluIGNocm9t aXVtLiBUaGlzIHBsYWNlcyBhIGxvY2sKICAgICAvLyBvbiB0aGUgZnJhbWUgaW4gY2hyb21pdW0s IGFuZCBjYWxscyB0byB0aGlzIG1ldGhvZCBzaG91bGQgYWx3YXlzIGJlCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcApp bmRleCA4NTNjYmNmN2Q4NTExNzRmYWRhZTE4MGMxODhiOWI5YTJiOGU2ODNjLi5iNDZlMmQyMWMw NTI2NTc2N2ZjNjMyYjJmYjlkMGE1ZjMzM2VhZDVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKQEAgLTQ1MCw2 ICs0NTAsMzQgQEAgTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgV2ViTWVkaWFQbGF5ZXJDbGll bnRJbXBsOjptb3ZpZUxvYWRUeXBlKCkgY29uc3QKICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6OlVu a25vd247CiB9CiAKK3Vuc2lnbmVkIGxvbmcgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpkZWNv ZGVkRnJhbWVzKCkgY29uc3QKK3sKKyAgICBpZiAobV93ZWJNZWRpYVBsYXllci5nZXQoKSkKKyAg ICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmRlY29kZWRGcmFtZXMoKTsKKyAgICByZXR1 cm4gMDsKK30KKwordW5zaWduZWQgbG9uZyBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRyb3Bw ZWRGcmFtZXMoKSBjb25zdAoreworICAgIGlmIChtX3dlYk1lZGlhUGxheWVyLmdldCgpKQorICAg ICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+ZHJvcHBlZEZyYW1lcygpOworICAgIHJldHVy biAwOworfQorCit1bnNpZ25lZCBsb25nIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6YXVkaW9C eXRlc0RlY29kZWQoKSBjb25zdAoreworICAgIGlmIChtX3dlYk1lZGlhUGxheWVyLmdldCgpKQor ICAgICAgICByZXR1cm4gbV93ZWJNZWRpYVBsYXllci0+YXVkaW9CeXRlc0RlY29kZWQoKTsKKyAg ICByZXR1cm4gMDsKK30KKwordW5zaWduZWQgbG9uZyBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6 OnZpZGVvQnl0ZXNEZWNvZGVkKCkgY29uc3QKK3sKKyAgICBpZiAobV93ZWJNZWRpYVBsYXllci5n ZXQoKSkKKyAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPnZpZGVvQnl0ZXNEZWNvZGVk KCk7CisgICAgcmV0dXJuIDA7Cit9CisKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CiBib29sIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6c3VwcG9ydHNBY2NlbGVyYXRlZFJlbmRl cmluZygpIGNvbnN0CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9X ZWJNZWRpYVBsYXllckNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl Yk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oCmluZGV4IGZjZGIyMTlhMTMwZmUzNDJjMGM1NDZhZmFm YmNlZWE4NGE1ZDg0NzkuLmQ4NjQwZWQzMmVmYmFiNWUzNGJiYzQwN2VkYTNjODBhZjdiMGU3NDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xp ZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVy Q2xpZW50SW1wbC5oCkBAIC0xMTQsNiArMTE0LDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZv aWQgcGFpbnRDdXJyZW50RnJhbWVJbkNvbnRleHQoV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0Kiwg Y29uc3QgV2ViQ29yZTo6SW50UmVjdCYpOwogICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1 cml0eU9yaWdpbigpIGNvbnN0OwogICAgIHZpcnR1YWwgV2ViQ29yZTo6TWVkaWFQbGF5ZXI6Ok1v dmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSgpIGNvbnN0OworICAgIHZpcnR1YWwgdW5zaWduZWQg bG9uZyBkZWNvZGVkRnJhbWVzKCkgY29uc3Q7CisgICAgdmlydHVhbCB1bnNpZ25lZCBsb25nIGRy b3BwZWRGcmFtZXMoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgYXVkaW9CeXRl c0RlY29kZWQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHVuc2lnbmVkIGxvbmcgdmlkZW9CeXRlc0Rl Y29kZWQoKSBjb25zdDsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgdmly dHVhbCBib29sIHN1cHBvcnRzQWNjZWxlcmF0ZWRSZW5kZXJpbmcoKSBjb25zdDsKIAo= 84082 2011-02-28 10:39:58 -0800 2011-03-03 01:33:28 -0800 Patch bug-54580-20110228103957.patch text/plain 4626 sjl U3VidmVyc2lvbiBSZXZpc2lvbjogNzk4NzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg YzgwY2I2YmE5Njc4ZjY5YmJjZTc1NDAxM2M3NmQwNzQ4YWU0NzU2ZC4uYmZiYjM3NTJlM2M1MWQ3 MDA2MDk5MGI5ZjliNWY3ZGQ2YmJiNGZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOSBAQAorMjAxMS0wMi0yOCAgU3RldmUgTGFjZXkgIDxzamxAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdpcmUg dXAgd2Via2l0IG1ldHJpY3MgY2hhbmdlcyB0byBjaHJvbWl1bSBjaGFuZ2VzLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ1ODAKKworICAgICAgICAq IGZlYXR1cmVzLmd5cGk6CisgICAgICAgICogcHVibGljL1dlYk1lZGlhUGxheWVyLmg6CisgICAg ICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYk1lZGlhUGxheWVyQ2xpZW50SW1wbDo6ZGVjb2RlZEZyYW1lQ291bnQpOgorICAgICAgICAo V2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OmRyb3BwZWRGcmFtZUNvdW50KToKKyAg ICAgICAgKFdlYktpdDo6V2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjphdWRpb0RlY29kZWRCeXRl Q291bnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYVBsYXllckNsaWVudEltcGw6OnZpZGVv RGVjb2RlZEJ5dGVDb3VudCk6CisgICAgICAgICogc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5oOgorCiAyMDExLTAyLTI3ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEZpc2hlci4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vZmVhdHVyZXMuZ3lwaSBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v ZmVhdHVyZXMuZ3lwaQppbmRleCA5MmNjZTExNjljY2FlMzllMGIyMmM4OGM2ZTViYjFhZjk0ZTU0 MTVhLi5mNmNiNGI0ZWM1ZDhjNGVmYTllNzU4OTE3ZTkyNDA0MDU4Y2U4NTYzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGkKKysrIGIvU291cmNlL1dlYktp dC9jaHJvbWl1bS9mZWF0dXJlcy5neXBpCkBAIC02NSw2ICs2NSw3IEBACiAgICAgICAgICdFTkFC TEVfSlNDX01VTFRJUExFX1RIUkVBRFM9MCcsCiAgICAgICAgICdFTkFCTEVfTElOS19QUkVGRVRD SD0xJywKICAgICAgICAgJ0VOQUJMRV9NQVRITUw9MCcsCisgICAgICAgICdFTkFCTEVfTUVESUFf U1RBVElTVElDUz0xJywKICAgICAgICAgJ0VOQUJMRV9NRVRFUl9UQUc9MScsCiAgICAgICAgICdF TkFCTEVfTk9USUZJQ0FUSU9OUz0xJywKICAgICAgICAgJ0VOQUJMRV9PRkZMSU5FX1dFQl9BUFBM SUNBVElPTlM9MScsCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJNZWRpYVBsYXllci5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViTWVkaWFQ bGF5ZXIuaAppbmRleCA2Y2VjMGY1NDkwZDYxNGE3OGNlNDdkODhjYjU2ZjcwOGIzNGVjMzAxLi5j MDA4NGRiOWZjM2IyNjlhZjc2ZWViZDU5NmI3Y2IyMWU4YmUxZTc3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJNZWRpYVBsYXllci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYk1lZGlhUGxheWVyLmgKQEAgLTEyOSw2ICsxMjksMTEg QEAgcHVibGljOgogICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1cml0eU9yaWdpbigpIGNv bnN0ID0gMDsKICAgICB2aXJ0dWFsIE1vdmllTG9hZFR5cGUgbW92aWVMb2FkVHlwZSgpIGNvbnN0 ID0gMDsKIAorICAgIHZpcnR1YWwgdW5zaWduZWQgZGVjb2RlZEZyYW1lQ291bnQoKSBjb25zdCA9 IDA7CisgICAgdmlydHVhbCB1bnNpZ25lZCBkcm9wcGVkRnJhbWVDb3VudCgpIGNvbnN0ID0gMDsK KyAgICB2aXJ0dWFsIHVuc2lnbmVkIGF1ZGlvRGVjb2RlZEJ5dGVDb3VudCgpIGNvbnN0ID0gMDsK KyAgICB2aXJ0dWFsIHVuc2lnbmVkIHZpZGVvRGVjb2RlZEJ5dGVDb3VudCgpIGNvbnN0ID0gMDsK KwogICAgIC8vIFRoaXMgZnVuY3Rpb24gcmV0dXJucyBhIHBvaW50ZXIgdG8gYSBXZWJWaWRlb0Zy YW1lLCB3aGljaCBpcwogICAgIC8vIGEgV2ViS2l0IHdyYXBwZXIgZm9yIGEgdmlkZW8gZnJhbWUg aW4gY2hyb21pdW0uIFRoaXMgcGxhY2VzIGEgbG9jawogICAgIC8vIG9uIHRoZSBmcmFtZSBpbiBj aHJvbWl1bSwgYW5kIGNhbGxzIHRvIHRoaXMgbWV0aG9kIHNob3VsZCBhbHdheXMgYmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1w bC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJNZWRpYVBsYXllckNsaWVudElt cGwuY3BwCmluZGV4IDg1M2NiY2Y3ZDg1MTE3NGZhZGFlMTgwYzE4OGI5YjlhMmI4ZTY4M2MuLmJm NTYwZWRlNmY3OTllNGVhZGY3ODRhNzg3MDBiOGVjZTExZTk0OTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5jcHAKKysrIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmNwcApA QCAtNDUwLDYgKzQ1MCwzNCBAQCBNZWRpYVBsYXllcjo6TW92aWVMb2FkVHlwZSBXZWJNZWRpYVBs YXllckNsaWVudEltcGw6Om1vdmllTG9hZFR5cGUoKSBjb25zdAogICAgIHJldHVybiBNZWRpYVBs YXllcjo6VW5rbm93bjsKIH0KIAordW5zaWduZWQgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpk ZWNvZGVkRnJhbWVDb3VudCgpIGNvbnN0Cit7CisgICAgaWYgKG1fd2ViTWVkaWFQbGF5ZXIuZ2V0 KCkpCisgICAgICAgIHJldHVybiBtX3dlYk1lZGlhUGxheWVyLT5kZWNvZGVkRnJhbWVDb3VudCgp OworICAgIHJldHVybiAwOworfQorCit1bnNpZ25lZCBXZWJNZWRpYVBsYXllckNsaWVudEltcGw6 OmRyb3BwZWRGcmFtZUNvdW50KCkgY29uc3QKK3sKKyAgICBpZiAobV93ZWJNZWRpYVBsYXllci5n ZXQoKSkKKyAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmRyb3BwZWRGcmFtZUNvdW50 KCk7CisgICAgcmV0dXJuIDA7Cit9CisKK3Vuc2lnbmVkIFdlYk1lZGlhUGxheWVyQ2xpZW50SW1w bDo6YXVkaW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3QKK3sKKyAgICBpZiAobV93ZWJNZWRpYVBs YXllci5nZXQoKSkKKyAgICAgICAgcmV0dXJuIG1fd2ViTWVkaWFQbGF5ZXItPmF1ZGlvRGVjb2Rl ZEJ5dGVDb3VudCgpOworICAgIHJldHVybiAwOworfQorCit1bnNpZ25lZCBXZWJNZWRpYVBsYXll ckNsaWVudEltcGw6OnZpZGVvRGVjb2RlZEJ5dGVDb3VudCgpIGNvbnN0Cit7CisgICAgaWYgKG1f d2ViTWVkaWFQbGF5ZXIuZ2V0KCkpCisgICAgICAgIHJldHVybiBtX3dlYk1lZGlhUGxheWVyLT52 aWRlb0RlY29kZWRCeXRlQ291bnQoKTsKKyAgICByZXR1cm4gMDsKK30KKwogI2lmIFVTRShBQ0NF TEVSQVRFRF9DT01QT1NJVElORykKIGJvb2wgV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsOjpzdXBw b3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkgY29uc3QKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1dlYk1lZGlhUGxheWVyQ2xpZW50SW1wbC5oIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmgKaW5kZXggZmNkYjIx OWExMzBmZTM0MmMwYzU0NmFmYWZiY2VlYTg0YTVkODQ3OS4uNWQ0NDYyNjkzMWRhODMzZjE3Yzkz MzQ3MDZmNmM3OGU1ZTA1NDZkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViTWVkaWFQbGF5ZXJDbGllbnRJbXBsLmgKQEAgLTExNCw2ICsxMTQsMTAgQEAgcHVi bGljOgogICAgIHZpcnR1YWwgdm9pZCBwYWludEN1cnJlbnRGcmFtZUluQ29udGV4dChXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQqLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVh bCBib29sIGhhc1NpbmdsZVNlY3VyaXR5T3JpZ2luKCkgY29uc3Q7CiAgICAgdmlydHVhbCBXZWJD b3JlOjpNZWRpYVBsYXllcjo6TW92aWVMb2FkVHlwZSBtb3ZpZUxvYWRUeXBlKCkgY29uc3Q7Cisg ICAgdmlydHVhbCB1bnNpZ25lZCBkZWNvZGVkRnJhbWVDb3VudCgpIGNvbnN0OworICAgIHZpcnR1 YWwgdW5zaWduZWQgZHJvcHBlZEZyYW1lQ291bnQoKSBjb25zdDsKKyAgICB2aXJ0dWFsIHVuc2ln bmVkIGF1ZGlvRGVjb2RlZEJ5dGVDb3VudCgpIGNvbnN0OworICAgIHZpcnR1YWwgdW5zaWduZWQg dmlkZW9EZWNvZGVkQnl0ZUNvdW50KCkgY29uc3Q7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBP U0lUSU5HKQogICAgIHZpcnR1YWwgYm9vbCBzdXBwb3J0c0FjY2VsZXJhdGVkUmVuZGVyaW5nKCkg Y29uc3Q7CiAK