57400 2011-03-29 16:32:23 -0700 Fullscreen code assumes all layers use GPU compositing when USE(ACCELERATED_COMPOSITING) 2011-04-05 10:41:00 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 ddorwin webkit-unassigned commit-queue ddorwin jer.noble vangelis oldest_to_newest 375868 0 ddorwin 2011-03-29 16:32:23 -0700 Document::webkitWillEnterFullScreenForElement, Document::webkitDidEnterFullScreenForElement, and Document::webkitWillExitFullScreenForElement all assert that m_fullScreenRenderer->layer()->backing() is valid inside the #if USE(ACCELERATED_COMPOSITING) blocks. However, accelerated compositing may be compiled in but disabled at runtime or for some elements. This is the case for Chromium, which supports a command line switch and does not currently accelerate all types of elements. In addition, the layout tests do not run with GPU acceleration enabled by default. These asserts and subsequent use of a NULL backing cause the fullscreen tests to crash in the non-GPU-enabled runs of DumpRenderTree and when Chrome is run without GPU acceleration enabled. I have a fix. 375885 1 87432 ddorwin 2011-03-29 16:50:46 -0700 Created attachment 87432 Check isComposited() before using the backing and remove the asserts. 375888 2 jer.noble 2011-03-29 16:54:08 -0700 Looks good to me. 379073 3 87432 levin 2011-04-04 14:20:09 -0700 Comment on attachment 87432 Check isComposited() before using the backing and remove the asserts. View in context: https://bugs.webkit.org/attachment.cgi?id=87432&action=review > Source/WebCore/ChangeLog:9 > + Accelerated compositing may be compiled in but disabled at runtime or for so This sentence looks incomplete. > Source/WebCore/dom/Document.cpp:4924 > + page()->chrome()->client()->setRootFullScreenLayer(m_fullScreenRenderer->layer()->backing()->graphicsLayer()); Your indent is incorrect. (4 space indent in WK unlike chromium with a 2 space indent). > Source/WebCore/dom/Document.cpp:4949 > + page()->chrome()->client()->setRootFullScreenLayer(m_fullScreenRenderer->layer()->backing()->graphicsLayer()); Ditto. 379093 4 88134 ddorwin 2011-04-04 14:45:41 -0700 Created attachment 88134 Fixed indent and ChangeLog. 379294 5 88134 commit-queue 2011-04-04 19:11:36 -0700 Comment on attachment 88134 Fixed indent and ChangeLog. Rejecting attachment 88134 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-7', 'apply-..." exit_code: 2 Last 500 characters of output: mmit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Parsed 2 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/dom/Document.cpp Hunk #1 succeeded at 4849 (offset -71 lines). Hunk #2 FAILED at 4861. Hunk #3 FAILED at 4874. 2 out of 3 hunks FAILED -- saving rejects to file Source/WebCore/dom/Document.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/8330185 379640 6 88254 ddorwin 2011-04-05 09:30:51 -0700 Created attachment 88254 Merged with head 379666 7 88257 ddorwin 2011-04-05 09:48:01 -0700 Created attachment 88257 Merged with head 379670 8 88257 webkit.review.bot 2011-04-05 09:51:24 -0700 Comment on attachment 88257 Merged with head Rejecting attachment 88257 from commit-queue. ddorwin@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 379727 9 88257 commit-queue 2011-04-05 10:40:54 -0700 Comment on attachment 88257 Merged with head Clearing flags on attachment: 88257 Committed r82956: <http://trac.webkit.org/changeset/82956> 379728 10 commit-queue 2011-04-05 10:41:00 -0700 All reviewed patches have been landed. Closing bug. 87432 2011-03-29 16:50:46 -0700 2011-04-04 14:45:39 -0700 Check isComposited() before using the backing and remove the asserts. bug-57400-20110329165044.patch text/plain 2896 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogODIzNDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YTk5NWY2ZTJhNmE3ZDdm ZWJiYmMyYmZmYWZlYzEyODM4Zjg4MTY4Li44YTY2YjkwMTE3YzhmMzUxY2NkZjA4ODRkM2FkZjM4 MGY2Y2QzMzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMjkgIERhdmlk IERvcndpbiAgPGRkb3J3aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZ1bGxzY3JlZW4gY29kZSBhc3N1bWVzIGFsbCBsYXll cnMgdXNlIEdQVSBjb21wb3NpdGluZyB3aGVuIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NDAwCisK KyAgICAgICAgQ2hlY2sgd2hldGhlciB0aGUgZnVsbCBzY3JlZW4gcmVuZGVyZXIgbGF5ZXIgaXMg YmVpbmcgY29tcG9zaXRlZCBieSB0aGUgR1BVIGJlZm9yZSBhc3N1bWluZyB0aGF0IHRoZSBiYWNr aW5nIGlzIHZhbGlkLiAKKyAgICAgICAgQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbWF5IGJlIGNv bXBpbGVkIGluIGJ1dCBkaXNhYmxlZCBhdCBydW50aW1lIG9yIGZvciBzbworCisgICAgICAgIFRl c3RzOiBGdWxsc2NyZWVuIGxheW91dCB0ZXN0cyBvbiBDaHJvbWl1bS4gCisKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OndlYmtpdFdpbGxF bnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp3 ZWJraXREaWRFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50Ojp3ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKwogMjAxMS0wMy0y OSAgR2F2aW4gUGV0ZXJzICA8Z2F2aW5wQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBUb255IEdlbnRpbGNvcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA4ZTk1ODVi ZGJiMjYxYzNmOWE2YjE1NTMzY2E3NzE3M2QyODM4MTlhLi43N2JhYzliYzgwZDNmNzdhMWZjNWEx NDcwMzE2NzdmNzJjMDY0ZmMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTQ5MjAsOCAr NDkyMCw4IEBAIHZvaWQgRG9jdW1lbnQ6OndlYmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVt ZW50KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5zZXRB bmltYXRpbmcodHJ1ZSk7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgICAg ICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKCk7Ci0gICAgICAgIEFTU0VSVChtX2Z1 bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpKTsKLSAgICAgICAgcGFnZSgpLT5j aHJvbWUoKS0+Y2xpZW50KCktPnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIobV9mdWxsU2NyZWVuUmVu ZGVyZXItPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpKTsKKyAgICAgICAgaWYg KG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5pc0NvbXBvc2l0ZWQoKSkKKyAgICAgICAg ICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihtX2Z1 bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGljc0xheWVyKCkpOwog I2VuZGlmCiAgICAgfQogfQpAQCAtNDkzMiw3ICs0OTMyLDYgQEAgdm9pZCBEb2N1bWVudDo6d2Vi a2l0RGlkRW50ZXJGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KikKICAgICAgICAgbV9mdWxs U2NyZWVuUmVuZGVyZXItPnNldEFuaW1hdGluZyhmYWxzZSk7CiAjaWYgVVNFKEFDQ0VMRVJBVEVE X0NPTVBPU0lUSU5HKQogICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKCk7 Ci0gICAgICAgIEFTU0VSVCghbV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJhY2tpbmco KSk7CiAgICAgICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVl bkxheWVyKDApOwogI2VuZGlmCiAgICAgfQpAQCAtNDk0Niw4ICs0OTQ1LDggQEAgdm9pZCBEb2N1 bWVudDo6d2Via2l0V2lsbEV4aXRGdWxsU2NyZWVuRm9yRWxlbWVudChFbGVtZW50KikKICAgICAg ICAgbV9mdWxsU2NyZWVuUmVuZGVyZXItPnNldEFuaW1hdGluZyh0cnVlKTsKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgIHZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdM YXllcnMoKTsKLSAgICAgICAgQVNTRVJUKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5i YWNraW5nKCkpOwotICAgICAgICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1 bGxTY3JlZW5MYXllcihtX2Z1bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpLT5n cmFwaGljc0xheWVyKCkpOworICAgICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVy KCktPmlzQ29tcG9zaXRlZCgpKQorICAgICAgICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgp LT5zZXRSb290RnVsbFNjcmVlbkxheWVyKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5i YWNraW5nKCktPmdyYXBoaWNzTGF5ZXIoKSk7CiAjZW5kaWYKICAgICB9CiB9Cg== 88134 2011-04-04 14:45:41 -0700 2011-04-05 09:30:48 -0700 Fixed indent and ChangeLog. bug-57400-20110404144540.patch text/plain 2909 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogODIzNDIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA0YTk5NWY2ZTJhNmE3ZDdm ZWJiYmMyYmZmYWZlYzEyODM4Zjg4MTY4Li4xMWNlZWY5YjJlZGUxZDE3NjIxMDJhODUzYTdlNGE0 NGUxMDMyYzcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMjkgIERhdmlk IERvcndpbiAgPGRkb3J3aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IERh dmlkIExldmluLgorCisgICAgICAgIEZ1bGxzY3JlZW4gY29kZSBhc3N1bWVzIGFsbCBsYXllcnMg dXNlIEdQVSBjb21wb3NpdGluZyB3aGVuIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NDAwCisKKyAg ICAgICAgQ2hlY2sgd2hldGhlciB0aGUgZnVsbCBzY3JlZW4gcmVuZGVyZXIgbGF5ZXIgaXMgYmVp bmcgY29tcG9zaXRlZCBieSB0aGUgR1BVIGJlZm9yZSBhc3N1bWluZyB0aGF0IHRoZSBiYWNraW5n IGlzIHZhbGlkLiAKKyAgICAgICAgQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbWF5IGJlIGNvbXBp bGVkIGluIGJ1dCBkaXNhYmxlZCBhdCBydW50aW1lIG9yIGZvciBzb21lIGVsZW1lbnRzLgorCisg ICAgICAgIFRlc3RzOiBGdWxsc2NyZWVuIGxheW91dCB0ZXN0cyBvbiBDaHJvbWl1bS4gCisKKyAg ICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6Ondl YmtpdFdpbGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkRv Y3VtZW50Ojp3ZWJraXREaWRFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50Ojp3ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KToKKwog MjAxMS0wMy0yOSAgR2F2aW4gUGV0ZXJzICA8Z2F2aW5wQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBUb255IEdlbnRpbGNvcmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRl eCA4ZTk1ODViZGJiMjYxYzNmOWE2YjE1NTMzY2E3NzE3M2QyODM4MTlhLi5jYzBmNmI3YmY1MTNk NzU5MTBjMmM0YTI0ZTJhYjE4MjExZmM1OWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAg LTQ5MjAsOCArNDkyMCw4IEBAIHZvaWQgRG9jdW1lbnQ6OndlYmtpdFdpbGxFbnRlckZ1bGxTY3Jl ZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgICAgIG1fZnVsbFNjcmVlblJlbmRl cmVyLT5zZXRBbmltYXRpbmcodHJ1ZSk7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQogICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJzKCk7Ci0gICAgICAgIEFT U0VSVChtX2Z1bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpKTsKLSAgICAgICAg cGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIobV9mdWxs U2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpKTsKKyAg ICAgICAgaWYgKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5pc0NvbXBvc2l0ZWQoKSkK KyAgICAgICAgICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVl bkxheWVyKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5iYWNraW5nKCktPmdyYXBoaWNz TGF5ZXIoKSk7CiAjZW5kaWYKICAgICB9CiB9CkBAIC00OTMyLDcgKzQ5MzIsNiBAQCB2b2lkIERv Y3VtZW50Ojp3ZWJraXREaWRFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqKQogICAg ICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlci0+c2V0QW5pbWF0aW5nKGZhbHNlKTsKICNpZiBVU0Uo QUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgIHZpZXcoKS0+dXBkYXRlQ29tcG9zaXRp bmdMYXllcnMoKTsKLSAgICAgICAgQVNTRVJUKCFtX2Z1bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIo KS0+YmFja2luZygpKTsKICAgICAgICAgcGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPnNldFJv b3RGdWxsU2NyZWVuTGF5ZXIoMCk7CiAjZW5kaWYKICAgICB9CkBAIC00OTQ2LDggKzQ5NDUsOCBA QCB2b2lkIERvY3VtZW50Ojp3ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1l bnQqKQogICAgICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlci0+c2V0QW5pbWF0aW5nKHRydWUpOwog I2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgdmlldygpLT51cGRhdGVD b21wb3NpdGluZ0xheWVycygpOwotICAgICAgICBBU1NFUlQobV9mdWxsU2NyZWVuUmVuZGVyZXIt PmxheWVyKCktPmJhY2tpbmcoKSk7Ci0gICAgICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgp LT5zZXRSb290RnVsbFNjcmVlbkxheWVyKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5i YWNraW5nKCktPmdyYXBoaWNzTGF5ZXIoKSk7CisgICAgICAgIGlmIChtX2Z1bGxTY3JlZW5SZW5k ZXJlci0+bGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkpCisgICAgICAgICAgICBwYWdlKCktPmNocm9t ZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihtX2Z1bGxTY3JlZW5SZW5kZXJl ci0+bGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGljc0xheWVyKCkpOwogI2VuZGlmCiAgICAgfQog fQo= 88254 2011-04-05 09:30:51 -0700 2011-04-05 09:47:57 -0700 Merged with head bug-57400-20110405093049.patch text/plain 2908 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogODI4ODAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYjk0Y2M5ZDY3N2Y2ODQ2 OWNlZTY0OTdjMWQ2MTZmNWE4NDc5YzQ2Li41M2ViYjc5ZGIxMzczNTZmMjVkYmM0MmM2MmU1YjBh OGFlZDhiOTYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMjkgIERhdmlk IERvcndpbiAgPGRkb3J3aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IERh dmlkIExldmluLgorCisgICAgICAgIEZ1bGxzY3JlZW4gY29kZSBhc3N1bWVzIGFsbCBsYXllcnMg dXNlIEdQVSBjb21wb3NpdGluZyB3aGVuIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NDAwCisKKyAg ICAgICAgQ2hlY2sgd2hldGhlciB0aGUgZnVsbCBzY3JlZW4gcmVuZGVyZXIgbGF5ZXIgaXMgYmVp bmcgY29tcG9zaXRlZCBieSB0aGUgR1BVIGJlZm9yZSBhc3N1bWluZyB0aGF0IHRoZSBiYWNraW5n IGlzIHZhbGlkLiAKKyAgICAgICAgQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbWF5IGJlIGNvbXBp bGVkIGluIGJ1dCBkaXNhYmxlZCBhdCBydW50aW1lIG9yIGZvciBzb21lIGVsZW1lbnRzLgorCisg ICAgICAgIFRlc3RzOiBGdWxsc2NyZWVuIGxheW91dCB0ZXN0cyBvbiBDaHJvbWl1bS4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6d2Vi a2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OndlYmtpdERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6OndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQpOgorCiAy MDExLTA0LTA0ICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4 IDUxNDQ3MDMyZTAwZjM2ZWQ2YmE1OWZiNGJiODMzMjk5NDcyYTBkNTYuLmMxMzJkZmNiYjVhMmFl ZjRmMTg2YjVhN2QxYzIzMDVlYWYwYzdlMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAt NDkyNiw4ICs0OTI2LDggQEAgdm9pZCBEb2N1bWVudDo6d2Via2l0V2lsbEVudGVyRnVsbFNjcmVl bkZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVudCkKICAgICAgICAgbV9mdWxsU2NyZWVuUmVuZGVy ZXItPnNldEFuaW1hdGluZyh0cnVlKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcp CiAgICAgICAgIHZpZXcoKS0+dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKTsKLSAgICAgICAgQVNT RVJUKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5iYWNraW5nKCkpOwotICAgICAgICBw YWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihtX2Z1bGxT Y3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGljc0xheWVyKCkpOworICAg ICAgICBpZiAobV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmlzQ29tcG9zaXRlZCgpKQor ICAgICAgICAgICAgcGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPnNldFJvb3RGdWxsU2NyZWVu TGF5ZXIobV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhpY3NM YXllcigpKTsKICNlbmRpZgogICAgIH0KIH0KQEAgLTQ5MzgsNyArNDkzOCw2IEBAIHZvaWQgRG9j dW1lbnQ6OndlYmtpdERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVudCopCiAgICAg ICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5zZXRBbmltYXRpbmcoZmFsc2UpOwogI2lmIFVTRShB Q0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAgdmlldygpLT51cGRhdGVDb21wb3NpdGlu Z0xheWVycygpOwotICAgICAgICBBU1NFUlQoIW1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigp LT5iYWNraW5nKCkpOwogICAgICAgICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9v dEZ1bGxTY3JlZW5MYXllcigwKTsKICNlbmRpZgogICAgIH0KQEAgLTQ5NTIsOCArNDk1MSw4IEBA IHZvaWQgRG9jdW1lbnQ6OndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQoRWxlbWVu dCopCiAgICAgICAgIG1fZnVsbFNjcmVlblJlbmRlcmVyLT5zZXRBbmltYXRpbmcodHJ1ZSk7CiAj aWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQogICAgICAgICB2aWV3KCktPnVwZGF0ZUNv bXBvc2l0aW5nTGF5ZXJzKCk7Ci0gICAgICAgIEFTU0VSVChtX2Z1bGxTY3JlZW5SZW5kZXJlci0+ bGF5ZXIoKS0+YmFja2luZygpKTsKLSAgICAgICAgcGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCkt PnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIobV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJh Y2tpbmcoKS0+Z3JhcGhpY3NMYXllcigpKTsKKyAgICAgICAgaWYgKG1fZnVsbFNjcmVlblJlbmRl cmVyLT5sYXllcigpLT5pc0NvbXBvc2l0ZWQoKSkKKyAgICAgICAgICAgIHBhZ2UoKS0+Y2hyb21l KCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVlbkxheWVyKG1fZnVsbFNjcmVlblJlbmRlcmVy LT5sYXllcigpLT5iYWNraW5nKCktPmdyYXBoaWNzTGF5ZXIoKSk7CiAjZW5kaWYKICAgICB9CiB9 Cg== 88257 2011-04-05 09:48:01 -0700 2011-04-05 10:40:54 -0700 Merged with head bug-57400-20110405094800.patch text/plain 2924 ddorwin U3VidmVyc2lvbiBSZXZpc2lvbjogODI5NDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzNzUwZTdlYzNjMDJkYmQ0 ZmU3MGVhZjg5M2RkYWQ0NjBmZjIzZWU5Li42ZmZlZDIzNDU5MTM4M2RiMzU0ZjA2NDg4NTYzZjE1 ZjhiZDM2YjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMjkgIERhdmlk IERvcndpbiAgPGRkb3J3aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IERh dmlkIExldmluLgorCisgICAgICAgIEZ1bGxzY3JlZW4gY29kZSBhc3N1bWVzIGFsbCBsYXllcnMg dXNlIEdQVSBjb21wb3NpdGluZyB3aGVuIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU3NDAwCisKKyAg ICAgICAgQ2hlY2sgd2hldGhlciB0aGUgZnVsbCBzY3JlZW4gcmVuZGVyZXIgbGF5ZXIgaXMgYmVp bmcgY29tcG9zaXRlZCBieSB0aGUgR1BVIGJlZm9yZSBhc3N1bWluZyB0aGF0IHRoZSBiYWNraW5n IGlzIHZhbGlkLiAKKyAgICAgICAgQWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgbWF5IGJlIGNvbXBp bGVkIGluIGJ1dCBkaXNhYmxlZCBhdCBydW50aW1lIG9yIGZvciBzb21lIGVsZW1lbnRzLgorCisg ICAgICAgIFRlc3RzOiBGdWxsc2NyZWVuIGxheW91dCB0ZXN0cyBvbiBDaHJvbWl1bS4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6d2Vi a2l0V2lsbEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6RG9j dW1lbnQ6OndlYmtpdERpZEVudGVyRnVsbFNjcmVlbkZvckVsZW1lbnQpOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6OndlYmtpdFdpbGxFeGl0RnVsbFNjcmVlbkZvckVsZW1lbnQpOgorCiAy MDExLTA0LTA1ICBOaWtvbGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4gJiBEaXJrIFNjaHVsemUuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0Rv Y3VtZW50LmNwcAppbmRleCAyNzkzMzcxZTkyNDliNmJmNWUzYzMyNzAxZDM2Yzg4YmJiZTQxYzc1 Li4zYjZiMDRiNmQ5MDFmZTQzMTY5MTM4NThlYzY2OTdlZjQ2NmY1NDhjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKQEAgLTQ4MjMsOCArNDgyMyw4IEBAIHZvaWQgRG9jdW1lbnQ6OndlYmtpdFdp bGxFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgICAgIG1f ZnVsbFNjcmVlblJlbmRlcmVyLT5zZXRBbmltYXRpbmcodHJ1ZSk7CiAjaWYgVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogICAgICAgICB2aWV3KCktPnVwZGF0ZUNvbXBvc2l0aW5nTGF5ZXJz KCk7Ci0gICAgICAgIEFTU0VSVChtX2Z1bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2lu ZygpKTsKLSAgICAgICAgcGFnZSgpLT5jaHJvbWUoKS0+Y2xpZW50KCktPnNldFJvb3RGdWxsU2Ny ZWVuTGF5ZXIobV9mdWxsU2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJhY2tpbmcoKS0+Z3JhcGhp Y3NMYXllcigpKTsKKyAgICAgICAgaWYgKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5p c0NvbXBvc2l0ZWQoKSkKKyAgICAgICAgICAgIHBhZ2UoKS0+Y2hyb21lKCktPmNsaWVudCgpLT5z ZXRSb290RnVsbFNjcmVlbkxheWVyKG1fZnVsbFNjcmVlblJlbmRlcmVyLT5sYXllcigpLT5iYWNr aW5nKCktPmdyYXBoaWNzTGF5ZXIoKSk7CiAjZW5kaWYKICAgICB9CiB9CkBAIC00ODM1LDcgKzQ4 MzUsNiBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXREaWRFbnRlckZ1bGxTY3JlZW5Gb3JFbGVtZW50 KEVsZW1lbnQqKQogICAgICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlci0+c2V0QW5pbWF0aW5nKGZh bHNlKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgIHZpZXcoKS0+ dXBkYXRlQ29tcG9zaXRpbmdMYXllcnMoKTsKLSAgICAgICAgQVNTRVJUKCFtX2Z1bGxTY3JlZW5S ZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpKTsKICAgICAgICAgcGFnZSgpLT5jaHJvbWUoKS0+ Y2xpZW50KCktPnNldFJvb3RGdWxsU2NyZWVuTGF5ZXIoMCk7CiAjZW5kaWYKICAgICB9CkBAIC00 ODQ5LDggKzQ4NDgsOCBAQCB2b2lkIERvY3VtZW50Ojp3ZWJraXRXaWxsRXhpdEZ1bGxTY3JlZW5G b3JFbGVtZW50KEVsZW1lbnQqKQogICAgICAgICBtX2Z1bGxTY3JlZW5SZW5kZXJlci0+c2V0QW5p bWF0aW5nKHRydWUpOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAgICAg dmlldygpLT51cGRhdGVDb21wb3NpdGluZ0xheWVycygpOwotICAgICAgICBBU1NFUlQobV9mdWxs U2NyZWVuUmVuZGVyZXItPmxheWVyKCktPmJhY2tpbmcoKSk7Ci0gICAgICAgIHBhZ2UoKS0+Y2hy b21lKCktPmNsaWVudCgpLT5zZXRSb290RnVsbFNjcmVlbkxheWVyKG1fZnVsbFNjcmVlblJlbmRl cmVyLT5sYXllcigpLT5iYWNraW5nKCktPmdyYXBoaWNzTGF5ZXIoKSk7CisgICAgICAgIGlmICht X2Z1bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+aXNDb21wb3NpdGVkKCkpCisgICAgICAgICAg ICBwYWdlKCktPmNocm9tZSgpLT5jbGllbnQoKS0+c2V0Um9vdEZ1bGxTY3JlZW5MYXllcihtX2Z1 bGxTY3JlZW5SZW5kZXJlci0+bGF5ZXIoKS0+YmFja2luZygpLT5ncmFwaGljc0xheWVyKCkpOwog I2VuZGlmCiAgICAgfQogfQo=