37311 2010-04-09 00:35:13 -0700 Crash exiting fullscreen with captions enabled 2010-04-09 19:59:40 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED InRadar P1 Critical --- 1 jer.noble jer.noble commit-queue darin eric jer.noble simon.fraser oldest_to_newest 210608 0 jer.noble 2010-04-09 00:35:13 -0700 In nightly builds of WebKit, the <video> element supports both captions and fullscreen. Each works well enough by itself, but we get a crash when exiting fullscreen with captions enabled (below). To reproduce: + Navigate to a movie with Closed Captions + Click the "Toggle Close Captions" button + Click the "Fullscreen" button + Once in fullscreen, click the "exit fullscreen" icon 2010-03-03 12:20:34.373 Safari[40964:a0f] *** -[QTMovieViewCALayerRendererView _qtMovieClosedCaptionDidChange:]: message sent to deallocated instance 0x11d8fa070 210744 1 52957 jer.noble 2010-04-09 08:53:07 -0700 Created attachment 52957 Patch 210760 2 52957 commit-queue 2010-04-09 09:25:02 -0700 Comment on attachment 52957 Patch Rejecting patch 52957 from commit-queue. Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Last 500 characters of output: /bin/sh -c /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebKit.build/Debug/WebKit.build/Script-5DE6D18C0FCF231B002DE28C.sh ** BUILD FAILED ** The following build commands failed: WebKit: Distributed-CompileC /Users/eseidel/Projects/CommitQueue/WebKitBuild/WebKit.build/Debug/WebKit.build/Objects-normal/i386/WebVideoFullscreenController.o /Users/eseidel/Projects/CommitQueue/WebKit/mac/WebView/WebVideoFullscreenController.mm normal i386 objective-c++ com.apple.compilers.gcc.4_2 (1 failure) Full output: http://webkit-commit-queue.appspot.com/results/1669224 210764 3 52960 jer.noble 2010-04-09 09:31:57 -0700 Created attachment 52960 Patch 210776 4 52960 commit-queue 2010-04-09 09:53:24 -0700 Comment on attachment 52960 Patch Clearing flags on attachment: 52960 Committed r57343: <http://trac.webkit.org/changeset/57343> 210777 5 commit-queue 2010-04-09 09:53:29 -0700 All reviewed patches have been landed. Closing bug. 210818 6 eric 2010-04-09 11:28:36 -0700 I believe this broke Tiger: /Volumes/Data/WebKit-BuildSlave/tiger-intel-release/build/WebKit/mac/WebView/WebVideoFullscreenController.mm: In function 'void -[WebVideoFullscreenController windowDidLoad](WebVideoFullscreenController*, objc_selector*)': /Volumes/Data/WebKit-BuildSlave/tiger-intel-release/build/WebKit/mac/WebView/WebVideoFullscreenController.mm:89: error: 'QTMovieLayer' was not declared in this scope /Volumes/Data/WebKit-BuildSlave/tiger-intel-release/build/WebKit/mac/WebView/WebVideoFullscreenController.mm:89: error: 'layer' was not declared in this scope cc1objplus: warnings being treated as errors 210831 7 eric 2010-04-09 12:04:31 -0700 We have code to make the commit-queue auto-rollout when it lands patches which break things. Its intentionally disabled for now. 210835 8 eric 2010-04-09 12:10:26 -0700 Reverted r57343 for reason: Broke Tiger compile. Committed r57348: <http://trac.webkit.org/changeset/57348> 210936 9 52992 jer.noble 2010-04-09 14:55:56 -0700 Created attachment 52992 Patch 210939 10 52992 darin 2010-04-09 14:58:40 -0700 Comment on attachment 52992 Patch > -SOFT_LINK_CLASS(QTKit, QTMovieView) > +SOFT_LINK_CLASS(QTKit, QTMovieLayer) Does this need to go inside the ifdef? > +#ifdef BUILDING_ON_TIGER > + // WebVideoFullscreenController is not supported on Tiger: > + ASSERT_NOT_REACHED(); I think it would be even better to put the entire body of the function inside the #ifdef. 210943 11 52992 darin 2010-04-09 14:59:12 -0700 Comment on attachment 52992 Patch I didn't set commit-queue+ but some other reviewer could after getting the answer from Jer. 210965 12 jer.noble 2010-04-09 15:24:04 -0700 > Does this need to go inside the ifdef? No, that macro expands into a set of ObjC functions which obtain a Class pointer at runtime. There will be no compile-time references to QTMovieLayer, except in string form. (i.e. "QTMovieLayer") I'll also include the entire body of the two functions in the #ifdef and resubmit the patch. 211002 13 53011 jer.noble 2010-04-09 16:08:24 -0700 Created attachment 53011 Patch 211100 14 53011 commit-queue 2010-04-09 19:59:34 -0700 Comment on attachment 53011 Patch Clearing flags on attachment: 53011 Committed r57403: <http://trac.webkit.org/changeset/57403> 211101 15 commit-queue 2010-04-09 19:59:40 -0700 All reviewed patches have been landed. Closing bug. 52957 2010-04-09 08:53:07 -0700 2010-04-09 09:31:51 -0700 Patch bug-37311-20100409085303.patch text/plain 3020 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NzMxMykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMDkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV29yayBhcm91bmQgUVRNb3ZpZVZpZXcgYnVnICg8cmRhcjovL3Byb2JsZW0vNzcxMjcx Mz4pIGJ5IHVzaW5nIGEgUVRNb3ZpZUxheWVyIGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMSAvIDxyZGFyOi8vcHJvYmxlbS83NzQ5 OTkzPgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1t OgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZExvYWRd KToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBzZXRNZWRpYUVsZW1l bnQ6V2ViQ29yZTo6XSk6CisKIDIwMTAtMDQtMDcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlz aW9uIDU3MzA1KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAKICNpbXBvcnQgPHd0Zi9V bnVzZWRQYXJhbS5oPgogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFFUS2l0KQotU09GVF9MSU5LX0NM QVNTKFFUS2l0LCBRVE1vdmllVmlldykKK1NPRlRfTElOS19DTEFTUyhRVEtpdCwgUVRNb3ZpZUxh eWVyKQogCiBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3Rp ZmljYXRpb24sIE5TU3RyaW5nICopCiAKQEAgLTg2LDE2ICs4NiwxNCBAQCAtIChXZWJWaWRlb0Z1 bGxzY3JlZW5XaW5kb3cgKilmdWxsc2NyZWVuCiAtICh2b2lkKXdpbmRvd0RpZExvYWQKIHsKICAg ICBXZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1bGxzY3JlZW5XaW5k b3ddOwotICAgIFFUTW92aWVWaWV3ICp2aWV3ID0gW1tnZXRRVE1vdmllVmlld0NsYXNzKCkgYWxs b2NdIGluaXRdOwotICAgIFt2aWV3IHNldEZpbGxDb2xvcjpbTlNDb2xvciBjbGVhckNvbG9yXV07 Ci0gICAgW3dpbmRvdyBzZXRDb250ZW50Vmlldzp2aWV3XTsKLSAgICBbdmlldyBzZXRDb250cm9s bGVyVmlzaWJsZTpOT107Ci0gICAgW3ZpZXcgc2V0UHJlc2VydmVzQXNwZWN0UmF0aW86WUVTXTsK KyAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGFsbG9j XSBpbml0XTsKKyAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0TGF5ZXI6bGF5ZXJdOworICAg IFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAgICAgaWYgKF9tZWRp YUVsZW1lbnQpCi0gICAgICAgIFt2aWV3IHNldE1vdmllOl9tZWRpYUVsZW1lbnQtPnBsYXRmb3Jt TWVkaWEoKS5xdE1vdmllXTsKKyAgICAgICAgW2xheWVyIHNldE1vdmllOl9tZWRpYUVsZW1lbnQt PnBsYXRmb3JtTWVkaWEoKS5xdE1vdmllXTsKICAgICBbd2luZG93IHNldEhhc1NoYWRvdzpZRVNd OyAvLyBUaGlzIGlzIG5pY2VyIHdpdGggYSBzaGFkb3cuCiAgICAgW3dpbmRvdyBzZXRMZXZlbDpO U1BvcFVwTWVudVdpbmRvd0xldmVsLTFdOwotICAgIFt2aWV3IHJlbGVhc2VdOworICAgIFtsYXll ciByZWxlYXNlXTsKIH0KIAogLSAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVt ZW50OwpAQCAtMTA3LDEyICsxMDUsMTIgQEAgLSAodm9pZClzZXRNZWRpYUVsZW1lbnQ6KFdlYkNv cmU6OkhUTUxNZQogewogICAgIF9tZWRpYUVsZW1lbnQgPSBtZWRpYUVsZW1lbnQ7CiAgICAgaWYg KFtzZWxmIGlzV2luZG93TG9hZGVkXSkgewotICAgICAgICBRVE1vdmllVmlldyAqbW92aWVWaWV3 ID0gKFFUTW92aWVWaWV3ICopW1tzZWxmIGZ1bGxzY3JlZW5XaW5kb3ddIGNvbnRlbnRWaWV3XTsK KyAgICAgICAgUVRNb3ZpZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3Nl bGYgZnVsbHNjcmVlbldpbmRvd10gY29udGVudFZpZXddIGxheWVyXTsKICAgICAgICAgUVRNb3Zp ZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZTsKIAotICAg ICAgICBBU1NFUlQobW92aWVWaWV3ICYmIFttb3ZpZVZpZXcgaXNLaW5kT2ZDbGFzczpbZ2V0UVRN b3ZpZVZpZXdDbGFzcygpIGNsYXNzXV0pOworICAgICAgICBBU1NFUlQobW92aWVWaWV3ICYmIFtt b3ZpZUxheWVyIGlzS2luZE9mQ2xhc3M6W2dldFFUTW92aWVMYXllckNsYXNzKCkgY2xhc3NdXSk7 CiAgICAgICAgIEFTU0VSVChtb3ZpZSk7Ci0gICAgICAgIFttb3ZpZVZpZXcgc2V0TW92aWU6bW92 aWVdOworICAgICAgICBbbW92aWVMYXllciBzZXRNb3ZpZTptb3ZpZV07CiAgICAgICAgIFtbTlNO b3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdG9yOkBzZWxl Y3RvcihyYXRlQ2hhbmdlZDopIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBuYW1lOlFUTW92aWVSYXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIAo= 52960 2010-04-09 09:31:57 -0700 2010-04-09 14:55:52 -0700 Patch bug-37311-20100409093155.patch text/plain 3021 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NzMxMykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMDkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV29yayBhcm91bmQgUVRNb3ZpZVZpZXcgYnVnICg8cmRhcjovL3Byb2JsZW0vNzcxMjcx Mz4pIGJ5IHVzaW5nIGEgUVRNb3ZpZUxheWVyIGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMSAvIDxyZGFyOi8vcHJvYmxlbS83NzQ5 OTkzPgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1t OgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZExvYWRd KToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBzZXRNZWRpYUVsZW1l bnQ6V2ViQ29yZTo6XSk6CisKIDIwMTAtMDQtMDcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlz aW9uIDU3MzA1KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAKICNpbXBvcnQgPHd0Zi9V bnVzZWRQYXJhbS5oPgogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFFUS2l0KQotU09GVF9MSU5LX0NM QVNTKFFUS2l0LCBRVE1vdmllVmlldykKK1NPRlRfTElOS19DTEFTUyhRVEtpdCwgUVRNb3ZpZUxh eWVyKQogCiBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3Rp ZmljYXRpb24sIE5TU3RyaW5nICopCiAKQEAgLTg2LDE2ICs4NiwxNCBAQCAtIChXZWJWaWRlb0Z1 bGxzY3JlZW5XaW5kb3cgKilmdWxsc2NyZWVuCiAtICh2b2lkKXdpbmRvd0RpZExvYWQKIHsKICAg ICBXZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1bGxzY3JlZW5XaW5k b3ddOwotICAgIFFUTW92aWVWaWV3ICp2aWV3ID0gW1tnZXRRVE1vdmllVmlld0NsYXNzKCkgYWxs b2NdIGluaXRdOwotICAgIFt2aWV3IHNldEZpbGxDb2xvcjpbTlNDb2xvciBjbGVhckNvbG9yXV07 Ci0gICAgW3dpbmRvdyBzZXRDb250ZW50Vmlldzp2aWV3XTsKLSAgICBbdmlldyBzZXRDb250cm9s bGVyVmlzaWJsZTpOT107Ci0gICAgW3ZpZXcgc2V0UHJlc2VydmVzQXNwZWN0UmF0aW86WUVTXTsK KyAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGFsbG9j XSBpbml0XTsKKyAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0TGF5ZXI6bGF5ZXJdOworICAg IFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAgICAgaWYgKF9tZWRp YUVsZW1lbnQpCi0gICAgICAgIFt2aWV3IHNldE1vdmllOl9tZWRpYUVsZW1lbnQtPnBsYXRmb3Jt TWVkaWEoKS5xdE1vdmllXTsKKyAgICAgICAgW2xheWVyIHNldE1vdmllOl9tZWRpYUVsZW1lbnQt PnBsYXRmb3JtTWVkaWEoKS5xdE1vdmllXTsKICAgICBbd2luZG93IHNldEhhc1NoYWRvdzpZRVNd OyAvLyBUaGlzIGlzIG5pY2VyIHdpdGggYSBzaGFkb3cuCiAgICAgW3dpbmRvdyBzZXRMZXZlbDpO U1BvcFVwTWVudVdpbmRvd0xldmVsLTFdOwotICAgIFt2aWV3IHJlbGVhc2VdOworICAgIFtsYXll ciByZWxlYXNlXTsKIH0KIAogLSAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudCopbWVkaWFFbGVt ZW50OwpAQCAtMTA3LDEyICsxMDUsMTIgQEAgLSAodm9pZClzZXRNZWRpYUVsZW1lbnQ6KFdlYkNv cmU6OkhUTUxNZQogewogICAgIF9tZWRpYUVsZW1lbnQgPSBtZWRpYUVsZW1lbnQ7CiAgICAgaWYg KFtzZWxmIGlzV2luZG93TG9hZGVkXSkgewotICAgICAgICBRVE1vdmllVmlldyAqbW92aWVWaWV3 ID0gKFFUTW92aWVWaWV3ICopW1tzZWxmIGZ1bGxzY3JlZW5XaW5kb3ddIGNvbnRlbnRWaWV3XTsK KyAgICAgICAgUVRNb3ZpZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3Nl bGYgZnVsbHNjcmVlbldpbmRvd10gY29udGVudFZpZXddIGxheWVyXTsKICAgICAgICAgUVRNb3Zp ZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZTsKIAotICAg ICAgICBBU1NFUlQobW92aWVWaWV3ICYmIFttb3ZpZVZpZXcgaXNLaW5kT2ZDbGFzczpbZ2V0UVRN b3ZpZVZpZXdDbGFzcygpIGNsYXNzXV0pOworICAgICAgICBBU1NFUlQobW92aWVMYXllciAmJiBb bW92aWVMYXllciBpc0tpbmRPZkNsYXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNzXV0p OwogICAgICAgICBBU1NFUlQobW92aWUpOwotICAgICAgICBbbW92aWVWaWV3IHNldE1vdmllOm1v dmllXTsKKyAgICAgICAgW21vdmllTGF5ZXIgc2V0TW92aWU6bW92aWVdOwogICAgICAgICBbW05T Tm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RvcjpAc2Vs ZWN0b3IocmF0ZUNoYW5nZWQ6KSAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbmFtZTpRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiAK 52992 2010-04-09 14:55:56 -0700 2010-04-09 16:08:20 -0700 Patch bug-37311-20100409145554.patch text/plain 3293 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NzMxMykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMDkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV29yayBhcm91bmQgUVRNb3ZpZVZpZXcgYnVnICg8cmRhcjovL3Byb2JsZW0vNzcxMjcx Mz4pIGJ5IHVzaW5nIGEgUVRNb3ZpZUxheWVyIGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMSAvIDxyZGFyOi8vcHJvYmxlbS83NzQ5 OTkzPgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1t OgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZExvYWRd KToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBzZXRNZWRpYUVsZW1l bnQ6V2ViQ29yZTo6XSk6CisKIDIwMTAtMDQtMDcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlz aW9uIDU3MzA1KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAKICNpbXBvcnQgPHd0Zi9V bnVzZWRQYXJhbS5oPgogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFFUS2l0KQotU09GVF9MSU5LX0NM QVNTKFFUS2l0LCBRVE1vdmllVmlldykKK1NPRlRfTElOS19DTEFTUyhRVEtpdCwgUVRNb3ZpZUxh eWVyKQogCiBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3Rp ZmljYXRpb24sIE5TU3RyaW5nICopCiAKQEAgLTg2LDE2ICs4NiwxOSBAQCAtIChXZWJWaWRlb0Z1 bGxzY3JlZW5XaW5kb3cgKilmdWxsc2NyZWVuCiAtICh2b2lkKXdpbmRvd0RpZExvYWQKIHsKICAg ICBXZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1bGxzY3JlZW5XaW5k b3ddOwotICAgIFFUTW92aWVWaWV3ICp2aWV3ID0gW1tnZXRRVE1vdmllVmlld0NsYXNzKCkgYWxs b2NdIGluaXRdOwotICAgIFt2aWV3IHNldEZpbGxDb2xvcjpbTlNDb2xvciBjbGVhckNvbG9yXV07 Ci0gICAgW3dpbmRvdyBzZXRDb250ZW50Vmlldzp2aWV3XTsKLSAgICBbdmlldyBzZXRDb250cm9s bGVyVmlzaWJsZTpOT107Ci0gICAgW3ZpZXcgc2V0UHJlc2VydmVzQXNwZWN0UmF0aW86WUVTXTsK KyNpZmRlZiBCVUlMRElOR19PTl9USUdFUgorICAgIC8vIFdlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIgaXMgbm90IHN1cHBvcnRlZCBvbiBUaWdlcjoKKyAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKKyNlbHNlCisgICAgUVRNb3ZpZUxheWVyICpsYXllciA9IFtbZ2V0UVRNb3ZpZUxheWVyQ2xh c3MoKSBhbGxvY10gaW5pdF07CisgICAgW1t3aW5kb3cgY29udGVudFZpZXddIHNldExheWVyOmxh eWVyXTsKKyAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0V2FudHNMYXllcjpZRVNdOwogICAg IGlmIChfbWVkaWFFbGVtZW50KQotICAgICAgICBbdmlldyBzZXRNb3ZpZTpfbWVkaWFFbGVtZW50 LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZV07CisgICAgICAgIFtsYXllciBzZXRNb3ZpZTpfbWVk aWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZV07CisgICAgW2xheWVyIHJlbGVhc2Vd OworI2VuZGlmCiAgICAgW3dpbmRvdyBzZXRIYXNTaGFkb3c6WUVTXTsgLy8gVGhpcyBpcyBuaWNl ciB3aXRoIGEgc2hhZG93LgogICAgIFt3aW5kb3cgc2V0TGV2ZWw6TlNQb3BVcE1lbnVXaW5kb3dM ZXZlbC0xXTsKLSAgICBbdmlldyByZWxlYXNlXTsKIH0KIAogLSAoV2ViQ29yZTo6SFRNTE1lZGlh RWxlbWVudCopbWVkaWFFbGVtZW50OwpAQCAtMTA3LDEyICsxMTAsMTcgQEAgLSAodm9pZClzZXRN ZWRpYUVsZW1lbnQ6KFdlYkNvcmU6OkhUTUxNZQogewogICAgIF9tZWRpYUVsZW1lbnQgPSBtZWRp YUVsZW1lbnQ7CiAgICAgaWYgKFtzZWxmIGlzV2luZG93TG9hZGVkXSkgewotICAgICAgICBRVE1v dmllVmlldyAqbW92aWVWaWV3ID0gKFFUTW92aWVWaWV3ICopW1tzZWxmIGZ1bGxzY3JlZW5XaW5k b3ddIGNvbnRlbnRWaWV3XTsKICAgICAgICAgUVRNb3ZpZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50 LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZTsKKyNpZmRlZiBCVUlMRElOR19PTl9USUdFUgorICAg ICAgICAvLyBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIGlzIG5vdCBzdXBwb3J0ZWQgb24g VGlnZXI6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworI2Vsc2UKKyAgICAgICAgUVRN b3ZpZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3NlbGYgZnVsbHNjcmVl bldpbmRvd10gY29udGVudFZpZXddIGxheWVyXTsKIAotICAgICAgICBBU1NFUlQobW92aWVWaWV3 ICYmIFttb3ZpZVZpZXcgaXNLaW5kT2ZDbGFzczpbZ2V0UVRNb3ZpZVZpZXdDbGFzcygpIGNsYXNz XV0pOworICAgICAgICBBU1NFUlQobW92aWVMYXllciAmJiBbbW92aWVMYXllciBpc0tpbmRPZkNs YXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNzXV0pOwogICAgICAgICBBU1NFUlQobW92 aWUpOwotICAgICAgICBbbW92aWVWaWV3IHNldE1vdmllOm1vdmllXTsKKyAgICAgICAgW21vdmll TGF5ZXIgc2V0TW92aWU6bW92aWVdOworI2VuZGlmCiAgICAgICAgIFtbTlNOb3RpZmljYXRpb25D ZW50ZXIgZGVmYXVsdENlbnRlcl0gYWRkT2JzZXJ2ZXI6c2VsZgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdG9yOkBzZWxlY3RvcihyYXRlQ2hh bmdlZDopIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBuYW1lOlFUTW92aWVSYXRlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIAo= 53011 2010-04-09 16:08:24 -0700 2010-04-09 19:59:34 -0700 Patch bug-37311-20100409160823.patch text/plain 3490 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA1NzMxMykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDQtMDkgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV29yayBhcm91bmQgUVRNb3ZpZVZpZXcgYnVnICg8cmRhcjovL3Byb2JsZW0vNzcxMjcx Mz4pIGJ5IHVzaW5nIGEgUVRNb3ZpZUxheWVyIGluc3RlYWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzMxMSAvIDxyZGFyOi8vcHJvYmxlbS83NzQ5 OTkzPgorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLm1t OgorICAgICAgICAoLVtXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIHdpbmRvd0RpZExvYWRd KToKKyAgICAgICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBzZXRNZWRpYUVsZW1l bnQ6V2ViQ29yZTo6XSk6CisKIDIwMTAtMDQtMDcgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9saXZlciBIdW50LgpJbmRleDogV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW0JKHJldmlz aW9uIDU3MzA1KQorKysgV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRy b2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDcgKzM3LDcgQEAKICNpbXBvcnQgPHd0Zi9V bnVzZWRQYXJhbS5oPgogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFFUS2l0KQotU09GVF9MSU5LX0NM QVNTKFFUS2l0LCBRVE1vdmllVmlldykKK1NPRlRfTElOS19DTEFTUyhRVEtpdCwgUVRNb3ZpZUxh eWVyKQogCiBTT0ZUX0xJTktfUE9JTlRFUihRVEtpdCwgUVRNb3ZpZVJhdGVEaWRDaGFuZ2VOb3Rp ZmljYXRpb24sIE5TU3RyaW5nICopCiAKQEAgLTg1LDE3ICs4NSwyMCBAQCAtIChXZWJWaWRlb0Z1 bGxzY3JlZW5XaW5kb3cgKilmdWxsc2NyZWVuCiAKIC0gKHZvaWQpd2luZG93RGlkTG9hZAogewor I2lmZGVmIEJVSUxESU5HX09OX1RJR0VSCisgICAgLy8gV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJv bGxlciBpcyBub3Qgc3VwcG9ydGVkIG9uIFRpZ2VyOgorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworI2Vsc2UKICAgICBXZWJWaWRlb0Z1bGxzY3JlZW5XaW5kb3cgKndpbmRvdyA9IFtzZWxmIGZ1 bGxzY3JlZW5XaW5kb3ddOwotICAgIFFUTW92aWVWaWV3ICp2aWV3ID0gW1tnZXRRVE1vdmllVmll d0NsYXNzKCkgYWxsb2NdIGluaXRdOwotICAgIFt2aWV3IHNldEZpbGxDb2xvcjpbTlNDb2xvciBj bGVhckNvbG9yXV07Ci0gICAgW3dpbmRvdyBzZXRDb250ZW50Vmlldzp2aWV3XTsKLSAgICBbdmll dyBzZXRDb250cm9sbGVyVmlzaWJsZTpOT107Ci0gICAgW3ZpZXcgc2V0UHJlc2VydmVzQXNwZWN0 UmF0aW86WUVTXTsKKyAgICBRVE1vdmllTGF5ZXIgKmxheWVyID0gW1tnZXRRVE1vdmllTGF5ZXJD bGFzcygpIGFsbG9jXSBpbml0XTsKKyAgICBbW3dpbmRvdyBjb250ZW50Vmlld10gc2V0TGF5ZXI6 bGF5ZXJdOworICAgIFtbd2luZG93IGNvbnRlbnRWaWV3XSBzZXRXYW50c0xheWVyOllFU107CiAg ICAgaWYgKF9tZWRpYUVsZW1lbnQpCi0gICAgICAgIFt2aWV3IHNldE1vdmllOl9tZWRpYUVsZW1l bnQtPnBsYXRmb3JtTWVkaWEoKS5xdE1vdmllXTsKKyAgICAgICAgW2xheWVyIHNldE1vdmllOl9t ZWRpYUVsZW1lbnQtPnBsYXRmb3JtTWVkaWEoKS5xdE1vdmllXTsKICAgICBbd2luZG93IHNldEhh c1NoYWRvdzpZRVNdOyAvLyBUaGlzIGlzIG5pY2VyIHdpdGggYSBzaGFkb3cuCiAgICAgW3dpbmRv dyBzZXRMZXZlbDpOU1BvcFVwTWVudVdpbmRvd0xldmVsLTFdOwotICAgIFt2aWV3IHJlbGVhc2Vd OworICAgIFtsYXllciByZWxlYXNlXTsKKyNlbmRpZgogfQogCiAtIChXZWJDb3JlOjpIVE1MTWVk aWFFbGVtZW50KiltZWRpYUVsZW1lbnQ7CkBAIC0xMDUsMTkgKzEwOCwyNCBAQCAtIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lCiAKIC0gKHZvaWQpc2V0TWVkaWFFbGVtZW50 OihXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50KiltZWRpYUVsZW1lbnQ7CiB7CisjaWZkZWYgQlVJ TERJTkdfT05fVElHRVIKKyAgICAvLyBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyIGlzIG5v dCBzdXBwb3J0ZWQgb24gVGlnZXI6CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisjZWxzZQog ICAgIF9tZWRpYUVsZW1lbnQgPSBtZWRpYUVsZW1lbnQ7CiAgICAgaWYgKFtzZWxmIGlzV2luZG93 TG9hZGVkXSkgewotICAgICAgICBRVE1vdmllVmlldyAqbW92aWVWaWV3ID0gKFFUTW92aWVWaWV3 ICopW1tzZWxmIGZ1bGxzY3JlZW5XaW5kb3ddIGNvbnRlbnRWaWV3XTsKICAgICAgICAgUVRNb3Zp ZSAqbW92aWUgPSBfbWVkaWFFbGVtZW50LT5wbGF0Zm9ybU1lZGlhKCkucXRNb3ZpZTsKKyAgICAg ICAgUVRNb3ZpZUxheWVyICptb3ZpZUxheWVyID0gKFFUTW92aWVMYXllciAqKVtbW3NlbGYgZnVs bHNjcmVlbldpbmRvd10gY29udGVudFZpZXddIGxheWVyXTsKIAotICAgICAgICBBU1NFUlQobW92 aWVWaWV3ICYmIFttb3ZpZVZpZXcgaXNLaW5kT2ZDbGFzczpbZ2V0UVRNb3ZpZVZpZXdDbGFzcygp IGNsYXNzXV0pOworICAgICAgICBBU1NFUlQobW92aWVMYXllciAmJiBbbW92aWVMYXllciBpc0tp bmRPZkNsYXNzOltnZXRRVE1vdmllTGF5ZXJDbGFzcygpIGNsYXNzXV0pOwogICAgICAgICBBU1NF UlQobW92aWUpOwotICAgICAgICBbbW92aWVWaWV3IHNldE1vdmllOm1vdmllXTsKKyAgICAgICAg W21vdmllTGF5ZXIgc2V0TW92aWU6bW92aWVdOwogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2Vu dGVyIGRlZmF1bHRDZW50ZXJdIGFkZE9ic2VydmVyOnNlbGYKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZWxlY3RvcjpAc2VsZWN0b3IocmF0ZUNoYW5n ZWQ6KSAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbmFtZTpRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiAKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG9iamVjdDptb3ZpZV07CiAgICAg fQorI2VuZGlmCiB9CiAKIC0gKGlkIDxXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyRGVsZWdh dGU+KWRlbGVnYXRlCg==