39370 2010-05-19 11:52:25 -0700 [chromium] Fix slider status when buffering 2010-05-21 07:44:29 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 vrk webkit-unassigned commit-queue hclam levin oldest_to_newest 227919 0 vrk 2010-05-19 11:52:25 -0700 When you load a video, the slider shows the entire video has been buffered, when only a small portion of it has been buffered. 227951 1 56511 vrk 2010-05-19 12:40:32 -0700 Created attachment 56511 Patch 227952 2 hclam 2010-05-19 12:45:47 -0700 Victoria is working with me on HTML5 video in Chromium. This change looks good to me. 228048 3 56511 levin 2010-05-19 16:19:03 -0700 Comment on attachment 56511 Patch Thanks Alpha for looking it over. Just a few minor nits to address. > diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog > + > + * rendering/RenderMediaControlsChromium.cpp: > + (WebCore::paintMediaSlider): > + Added logic to align the buffering bar with the thumb. Half of the thumb image is transparent, so the buffer bar is adjusted to fill in this gap. ChangeLog entries tend to wrap text somewhere around 80 columns. > diff --git a/WebCore/rendering/RenderMediaControlsChromium.cpp b/WebCore/rendering/RenderMediaControlsChromium.cpp > +static Image* getMediaSliderThumb() > +{ > + static Image* mediaSliderThumb = platformResource("mediaSliderThumb"); Two spaces before = > + > + double bufferedWidth = 0.0; > + if (mediaElement->percentLoaded() > 0.0) { > + // Account for width of slider thumb Please add a period to the end of the comment. > + Image* mediaSliderThumb = getMediaSliderThumb(); > + double thumbWidth = mediaSliderThumb->width() / 2.0 + 1.0; > + double rectWidth = bufferedRect.width() - thumbWidth; > + if (rectWidth < 0) > + rectWidth = 0; I'm not sure why you initialized "double bufferedWidth" with 0.0 above but are using 0 here. (It doesn't matter but inconsistency raises flags for me.) 228432 4 56604 vrk 2010-05-20 09:57:58 -0700 Created attachment 56604 Patch 228903 5 56604 commit-queue 2010-05-21 07:44:18 -0700 Comment on attachment 56604 Patch Clearing flags on attachment: 56604 Committed r59932: <http://trac.webkit.org/changeset/59932> 228904 6 commit-queue 2010-05-21 07:44:29 -0700 All reviewed patches have been landed. Closing bug. 56511 2010-05-19 12:40:32 -0700 2010-05-20 09:57:54 -0700 Patch bug-39370-20100519124031.patch text/plain 3051 vrk ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTdkMWU5OTU3ZDZjNDc5ODIwMDdkZDM4OTZiZjU3OWY4NjM3Njg5Ny4uMzQzNzg2OWI1NmZiZjBj NWY0NWU5Y2QzYWY0YTFkNGFmODAzNzM2NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNS0xOSAgVmlj dG9yaWEgS2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBzbGlkZXIgc3RhdHVzIHdoZW4g YnVmZmVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTM3MAorICAgICAgICBBZGp1c3RzIHRoZSBidWZmZXJpbmcgYmFyIHRvIGJlIGFsaWduZWQg d2l0aCB0aGUgc2xpZGVyIHRodW1iLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKENvdmVyZWQg YnkgZXhpc3RpbmcgbGF5b3V0IHRlc3RzLikKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJN ZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFpbnRNZWRpYVNs aWRlcik6CisgICAgICAgIEFkZGVkIGxvZ2ljIHRvIGFsaWduIHRoZSBidWZmZXJpbmcgYmFyIHdp dGggdGhlIHRodW1iLiBIYWxmIG9mIHRoZSB0aHVtYiBpbWFnZSBpcyB0cmFuc3BhcmVudCwgc28g dGhlIGJ1ZmZlciBiYXIgaXMgYWRqdXN0ZWQgdG8gZmlsbCBpbiB0aGlzIGdhcC4KKwogMjAxMC0w NS0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVk aWFDb250cm9sc0Nocm9taXVtLmNwcAppbmRleCA1MGZlYjQ2MDRlNGVhOTRhNWNhMmIyYmI2YjM5 ODcyNDE0M2EzOTkzLi41ZGUyMDVhNjhkZGVjNjY5Yzc4YzM5MDViZjU2MGUxMWJmNDliNmZkIDEw MDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0u Y3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlhQ29udHJvbHNDaHJvbWl1bS5j cHAKQEAgLTk5LDYgKzk5LDEyIEBAIHN0YXRpYyBib29sIHBhaW50TWVkaWFQbGF5QnV0dG9uKFJl bmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50CiAgICAgcmV0dXJu IHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJlY3QsIG1lZGlhRWxlbWVudC0+ cGF1c2VkKCkgPyBtZWRpYVBsYXkgOiBtZWRpYVBhdXNlKTsKIH0KIAorc3RhdGljIEltYWdlKiBn ZXRNZWRpYVNsaWRlclRodW1iKCkKK3sKKyAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhU2xpZGVyVGh1 bWIgID0gcGxhdGZvcm1SZXNvdXJjZSgibWVkaWFTbGlkZXJUaHVtYiIpOworICAgIHJldHVybiBt ZWRpYVNsaWRlclRodW1iOworfQorCiBzdGF0aWMgYm9vbCBwYWludE1lZGlhU2xpZGVyKFJlbmRl ck9iamVjdCogb2JqZWN0LCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW50SW5mbyYgcGFpbnRJbmZv LCBjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIEhUTUxNZWRpYUVsZW1lbnQqIG1lZGlhRWxl bWVudCA9IHRvUGFyZW50TWVkaWFFbGVtZW50KG9iamVjdCk7CkBAIC0xMjQsNyArMTMwLDE4IEBA IHN0YXRpYyBib29sIHBhaW50TWVkaWFTbGlkZXIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0 IFJlbmRlck9iamVjdDo6UGFpbnRJbmZvCiAgICAgLy8gRklYTUU6IERyYXcgbXVsdGlwbGUgcmFu Z2VzIGlmIHRoZXJlIGFyZSBtdWx0aXBsZSBidWZmZXJlZCByYW5nZXMuCiAgICAgSW50UmVjdCBi dWZmZXJlZFJlY3QgPSByZWN0OwogICAgIGJ1ZmZlcmVkUmVjdC5pbmZsYXRlKC1zdHlsZS0+Ym9y ZGVyTGVmdFdpZHRoKCkpOwotICAgIGJ1ZmZlcmVkUmVjdC5zZXRXaWR0aCgoYnVmZmVyZWRSZWN0 LndpZHRoKCkgKiBtZWRpYUVsZW1lbnQtPnBlcmNlbnRMb2FkZWQoKSkpOworCisgICAgZG91Ymxl IGJ1ZmZlcmVkV2lkdGggPSAwLjA7CisgICAgaWYgKG1lZGlhRWxlbWVudC0+cGVyY2VudExvYWRl ZCgpID4gMC4wKSB7CisgICAgICAgIC8vIEFjY291bnQgZm9yIHdpZHRoIG9mIHNsaWRlciB0aHVt YgorICAgICAgICBJbWFnZSogbWVkaWFTbGlkZXJUaHVtYiA9IGdldE1lZGlhU2xpZGVyVGh1bWIo KTsKKyAgICAgICAgZG91YmxlIHRodW1iV2lkdGggPSBtZWRpYVNsaWRlclRodW1iLT53aWR0aCgp IC8gMi4wICsgMS4wOworICAgICAgICBkb3VibGUgcmVjdFdpZHRoID0gYnVmZmVyZWRSZWN0Lndp ZHRoKCkgLSB0aHVtYldpZHRoOworICAgICAgICBpZiAocmVjdFdpZHRoIDwgMCkKKyAgICAgICAg ICAgIHJlY3RXaWR0aCA9IDA7CisgICAgICAgIGJ1ZmZlcmVkV2lkdGggPSByZWN0V2lkdGggKiBt ZWRpYUVsZW1lbnQtPnBlcmNlbnRMb2FkZWQoKSArIHRodW1iV2lkdGg7CisgICAgfQorICAgIGJ1 ZmZlcmVkUmVjdC5zZXRXaWR0aChidWZmZXJlZFdpZHRoKTsKIAogICAgIC8vIERvbid0IGJvdGhl ciBkcmF3aW5nIGFuIGVtcHR5IGFyZWEuCiAgICAgaWYgKCFidWZmZXJlZFJlY3QuaXNFbXB0eSgp KSB7CkBAIC0xNTksNyArMTc2LDcgQEAgc3RhdGljIGJvb2wgcGFpbnRNZWRpYVNsaWRlclRodW1i KFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBSZW5kZXJPYmplY3Q6OlBhaW4KICAgICBpZiAo IWhhc1NvdXJjZShtZWRpYUVsZW1lbnQpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHN0 YXRpYyBJbWFnZSogbWVkaWFTbGlkZXJUaHVtYiA9IHBsYXRmb3JtUmVzb3VyY2UoIm1lZGlhU2xp ZGVyVGh1bWIiKTsKKyAgICBJbWFnZSogbWVkaWFTbGlkZXJUaHVtYiA9IGdldE1lZGlhU2xpZGVy VGh1bWIoKTsKICAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8uY29udGV4dCwg cmVjdCwgbWVkaWFTbGlkZXJUaHVtYik7CiB9CiAK 56604 2010-05-20 09:57:58 -0700 2010-05-21 07:44:17 -0700 Patch bug-39370-20100520095756.patch text/plain 3081 vrk ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MTdkMWU5OTU3ZDZjNDc5ODIwMDdkZDM4OTZiZjU3OWY4NjM3Njg5Ny4uNzNmNzM3YmMwNzM3NmVk MDdkNDhjYTcxZTlhNTU1NWM3ZGI4YWZkOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNS0xOSAgVmlj dG9yaWEgS2lyc3QgIDx2cmtAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbY2hyb21pdW1dIEZpeCBzbGlkZXIgc3RhdHVzIHdoZW4g YnVmZmVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0zOTM3MAorICAgICAgICBBZGp1c3RzIHRoZSBidWZmZXJpbmcgYmFyIHRvIGJlIGFsaWduZWQg d2l0aCB0aGUgc2xpZGVyIHRodW1iLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKENvdmVyZWQg YnkgZXhpc3RpbmcgbGF5b3V0IHRlc3RzLikKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJN ZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6cGFpbnRNZWRpYVNs aWRlcik6CisgICAgICAgIEFkZGVkIGxvZ2ljIHRvIGFsaWduIHRoZSBidWZmZXJpbmcgYmFyIHdp dGggdGhlIHRodW1iLiBIYWxmIG9mIHRoZQorICAgICAgICB0aHVtYiBpbWFnZSBpcyB0cmFuc3Bh cmVudCwgc28gdGhlIGJ1ZmZlciBiYXIgaXMgYWRqdXN0ZWQgdG8gZmlsbCBpbgorICAgICAgICB0 aGlzIGdhcC4KKwogMjAxMC0wNS0xOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNZWRpYUNvbnRyb2xzQ2hyb21pdW0uY3BwIGIvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTWVkaWFDb250cm9sc0Nocm9taXVtLmNwcAppbmRleCA1MGZlYjQ2MDRl NGVhOTRhNWNhMmIyYmI2YjM5ODcyNDE0M2EzOTkzLi4wZjJhZGE4ZDY0MTQwZTY0NTBkMDRhYWJj ZTFjNWYxZjk0ZmE5Yzk5IDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZWRp YUNvbnRyb2xzQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lZGlh Q29udHJvbHNDaHJvbWl1bS5jcHAKQEAgLTk5LDYgKzk5LDEyIEBAIHN0YXRpYyBib29sIHBhaW50 TWVkaWFQbGF5QnV0dG9uKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBSZW5kZXJPYmplY3Q6 OlBhaW50CiAgICAgcmV0dXJuIHBhaW50TWVkaWFCdXR0b24ocGFpbnRJbmZvLmNvbnRleHQsIHJl Y3QsIG1lZGlhRWxlbWVudC0+cGF1c2VkKCkgPyBtZWRpYVBsYXkgOiBtZWRpYVBhdXNlKTsKIH0K IAorc3RhdGljIEltYWdlKiBnZXRNZWRpYVNsaWRlclRodW1iKCkKK3sKKyAgICBzdGF0aWMgSW1h Z2UqIG1lZGlhU2xpZGVyVGh1bWIgPSBwbGF0Zm9ybVJlc291cmNlKCJtZWRpYVNsaWRlclRodW1i Iik7CisgICAgcmV0dXJuIG1lZGlhU2xpZGVyVGh1bWI7Cit9CisKIHN0YXRpYyBib29sIHBhaW50 TWVkaWFTbGlkZXIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFJlbmRlck9iamVjdDo6UGFp bnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgSFRNTE1lZGlh RWxlbWVudCogbWVkaWFFbGVtZW50ID0gdG9QYXJlbnRNZWRpYUVsZW1lbnQob2JqZWN0KTsKQEAg LTEyNCw3ICsxMzAsMTggQEAgc3RhdGljIGJvb2wgcGFpbnRNZWRpYVNsaWRlcihSZW5kZXJPYmpl Y3QqIG9iamVjdCwgY29uc3QgUmVuZGVyT2JqZWN0OjpQYWludEluZm8KICAgICAvLyBGSVhNRTog RHJhdyBtdWx0aXBsZSByYW5nZXMgaWYgdGhlcmUgYXJlIG11bHRpcGxlIGJ1ZmZlcmVkIHJhbmdl cy4KICAgICBJbnRSZWN0IGJ1ZmZlcmVkUmVjdCA9IHJlY3Q7CiAgICAgYnVmZmVyZWRSZWN0Lmlu ZmxhdGUoLXN0eWxlLT5ib3JkZXJMZWZ0V2lkdGgoKSk7Ci0gICAgYnVmZmVyZWRSZWN0LnNldFdp ZHRoKChidWZmZXJlZFJlY3Qud2lkdGgoKSAqIG1lZGlhRWxlbWVudC0+cGVyY2VudExvYWRlZCgp KSk7CisKKyAgICBkb3VibGUgYnVmZmVyZWRXaWR0aCA9IDAuMDsKKyAgICBpZiAobWVkaWFFbGVt ZW50LT5wZXJjZW50TG9hZGVkKCkgPiAwLjApIHsKKyAgICAgICAgLy8gQWNjb3VudCBmb3IgdGhl IHdpZHRoIG9mIHRoZSBzbGlkZXIgdGh1bWIuCisgICAgICAgIEltYWdlKiBtZWRpYVNsaWRlclRo dW1iID0gZ2V0TWVkaWFTbGlkZXJUaHVtYigpOworICAgICAgICBkb3VibGUgdGh1bWJXaWR0aCA9 IG1lZGlhU2xpZGVyVGh1bWItPndpZHRoKCkgLyAyLjAgKyAxLjA7CisgICAgICAgIGRvdWJsZSBy ZWN0V2lkdGggPSBidWZmZXJlZFJlY3Qud2lkdGgoKSAtIHRodW1iV2lkdGg7CisgICAgICAgIGlm IChyZWN0V2lkdGggPCAwLjApCisgICAgICAgICAgICByZWN0V2lkdGggPSAwLjA7CisgICAgICAg IGJ1ZmZlcmVkV2lkdGggPSByZWN0V2lkdGggKiBtZWRpYUVsZW1lbnQtPnBlcmNlbnRMb2FkZWQo KSArIHRodW1iV2lkdGg7CisgICAgfQorICAgIGJ1ZmZlcmVkUmVjdC5zZXRXaWR0aChidWZmZXJl ZFdpZHRoKTsKIAogICAgIC8vIERvbid0IGJvdGhlciBkcmF3aW5nIGFuIGVtcHR5IGFyZWEuCiAg ICAgaWYgKCFidWZmZXJlZFJlY3QuaXNFbXB0eSgpKSB7CkBAIC0xNTksNyArMTc2LDcgQEAgc3Rh dGljIGJvb2wgcGFpbnRNZWRpYVNsaWRlclRodW1iKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25z dCBSZW5kZXJPYmplY3Q6OlBhaW4KICAgICBpZiAoIWhhc1NvdXJjZShtZWRpYUVsZW1lbnQpKQog ICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIHN0YXRpYyBJbWFnZSogbWVkaWFTbGlkZXJUaHVt YiA9IHBsYXRmb3JtUmVzb3VyY2UoIm1lZGlhU2xpZGVyVGh1bWIiKTsKKyAgICBJbWFnZSogbWVk aWFTbGlkZXJUaHVtYiA9IGdldE1lZGlhU2xpZGVyVGh1bWIoKTsKICAgICByZXR1cm4gcGFpbnRN ZWRpYUJ1dHRvbihwYWludEluZm8uY29udGV4dCwgcmVjdCwgbWVkaWFTbGlkZXJUaHVtYik7CiB9 CiAK