72005 2011-11-10 00:47:11 -0800 Do not share CSS style for MediaElement backed by a plugin 2011-11-10 13:44:47 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin ddkilzer macpherson simon.fraser webkit.review.bot oldest_to_newest 499713 0 benjamin 2011-11-10 00:47:11 -0800 RenderObject::setStyle() ASSERTs with PLUGIN_PROXY_FOR_VIDEO because the style is shared for an embedded object. 499718 1 114452 benjamin 2011-11-10 01:03:18 -0800 Created attachment 114452 Patch 499968 2 114452 webkit.review.bot 2011-11-10 09:03:03 -0800 Comment on attachment 114452 Patch Rejecting attachment 114452 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: ebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 [GTK] [WebKit2] Fix remaining gtkdoc errors When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 157. Full output: http://queues.webkit.org/results/10364042 500232 3 benjamin 2011-11-10 13:44:47 -0800 Committed r99896: <http://trac.webkit.org/changeset/99896> 114452 2011-11-10 01:03:18 -0800 2011-11-10 09:03:03 -0800 Patch bug-72005-20111110010317.patch text/plain 2333 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogOTk3ODYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYjRkOTY4NWM4NTZiZDE2 MGE5Mzk4MmM2MjIzM2JkMTk3ODRkNTJmLi5mMDRkMDk0NjQ5ZTJiYjIyZTdjMDY5NjMyZTAwZTVh YjA1NzhhOTFiIDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMTEtMTAgIEJlbmph bWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIERvIG5vdCBzaGFy ZSBDU1Mgc3R5bGUgZm9yIE1lZGlhRWxlbWVudCBiYWNrZWQgYnkgYSBwbHVnaW4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcyMDA1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2l0aCBQTFVHSU5fUFJPWFlf Rk9SX1ZJREVPLCB0aGUgUmVuZGVyTWVkaWEgZWxlbWVudHMgYXJlIHJlbmRlcmVkIHRocm91Z2gg UmVuZGVyQm94TW9kZWxPYmplY3QuCisgICAgICAgIExpa2UgdGhlIGVtYmVkZGVkIGVsZW1lbnQs IHRoZSBwcm94aWVkIG1lZGlhIGVsZW1lbnQgY2FuIGdhaW4gYSBsYXllciBvdXRzaWRlIGEgY2hh bmdlIG9mIHN0eWxlLgorCisgICAgICAgIFRoaXMgcGF0Y2ggcHJldmVudHMgc3R5bGUgc2hhcmlu ZyBmb3IgdGhlIEF1ZGlvIGFuZCBWaWRlbyBlbGVtZW50cyB3aGVuIFBMVUdJTl9QUk9YWV9GT1Jf VklERU8KKyAgICAgICAgaXMgZW5hYmxlZC4KKworICAgICAgICBUaGlzIHBhdGggaXMgY292ZXJl ZCBieSBleGlzaW5nIHRlc3RzLiBJbiBwYXJ0aWN1bGFyLCBodHRwL3Rlc3RzL21pc2MvZW1wdHkt dXJscy5odG1sCisgICAgICAgIEFTU0VSVCgpIGJlY2F1c2Ugb2YgdGhpcy4KKworICAgICAgICAq IGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2Vs ZWN0b3I6OmNhblNoYXJlU3R5bGVXaXRoRWxlbWVudCk6CisKIDIwMTEtMTEtMDkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgZmVJbWFnZSByZWZlcmVu Y2luZyBhIHByaW1pdGl2ZSBkcmF3cyBpbmNvcnJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwCmluZGV4IDYyNmEyYTExOTZiZmVjZjU0MDZlMGJiY2U5MzczMzE5ZDc5 MjE3MDMuLjcwNzFjODBiN2NiOGQ3MmE3MWVhOTZkNWVkYmM4YjA0M2VkZDQzZWQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKQEAgLTEwMzMsNyArMTAzMywxMiBAQCBi b29sIENTU1N0eWxlU2VsZWN0b3I6OmNhblNoYXJlU3R5bGVXaXRoRWxlbWVudChOb2RlKiBub2Rl KSBjb25zdAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAvLyBUdXJuIG9m ZiBzdHlsZSBzaGFyaW5nIGZvciBlbGVtZW50cyB0aGF0IGNhbiBnYWluIGxheWVycyBmb3IgcmVh c29ucyBvdXRzaWRlIG9mIHRoZSBzdHlsZSBzeXN0ZW0uCiAgICAgLy8gU2VlIGNvbW1lbnRzIGlu IFJlbmRlck9iamVjdDo6c2V0U3R5bGUoKS4KLSAgICBpZiAoZWxlbWVudC0+aGFzVGFnTmFtZShp ZnJhbWVUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoZnJhbWVUYWcpIHx8IGVsZW1lbnQtPmhh c1RhZ05hbWUoZW1iZWRUYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUob2JqZWN0VGFnKSB8fCBl bGVtZW50LT5oYXNUYWdOYW1lKGFwcGxldFRhZykpCisgICAgaWYgKGVsZW1lbnQtPmhhc1RhZ05h bWUoaWZyYW1lVGFnKSB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKGZyYW1lVGFnKSB8fCBlbGVtZW50 LT5oYXNUYWdOYW1lKGVtYmVkVGFnKSB8fCBlbGVtZW50LT5oYXNUYWdOYW1lKG9iamVjdFRhZykg fHwgZWxlbWVudC0+aGFzVGFnTmFtZShhcHBsZXRUYWcpCisjaWYgRU5BQkxFKFBMVUdJTl9QUk9Y WV9GT1JfVklERU8pCisgICAgICAgIC8vIFdpdGggcHJveHlpbmcsIHRoZSBtZWRpYSBlbGVtZW50 cyBhcmUgYmFja2VkIGJ5IGEgUmVuZGVyRW1iZWRkZWRPYmplY3QuCisgICAgICAgIHx8IGVsZW1l bnQtPmhhc1RhZ05hbWUodmlkZW9UYWcpIHx8IGVsZW1lbnQtPmhhc1RhZ05hbWUoYXVkaW9UYWcp CisjZW5kaWYKKyAgICAgICAgKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAjZW5kaWYKIAo=