79998 2012-02-29 19:07:24 -0800 Handle CSSPropertyWebkitBorderFit in CSSStyleApplyProperty. 2012-03-01 19:19:05 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson eric kling macpherson menard webkit.review.bot oldest_to_newest 568223 0 macpherson 2012-02-29 19:07:24 -0800 Handle CSSPropertyWebkitBorderFit in CSSStyleApplyProperty. 568224 1 129613 macpherson 2012-02-29 19:11:17 -0800 Created attachment 129613 Patch 568499 2 129613 webkit.review.bot 2012-03-01 02:37:43 -0800 Comment on attachment 129613 Patch Rejecting attachment 129613 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: -merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Failed to merge in the changes. Patch failed at 0001 [Qt][WK2] Unreviewed buildfix after r109277. 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 164. Full output: http://queues.webkit.org/results/11769353 569169 3 129613 webkit.review.bot 2012-03-01 19:19:00 -0800 Comment on attachment 129613 Patch Clearing flags on attachment: 129613 Committed r109488: <http://trac.webkit.org/changeset/109488> 569170 4 webkit.review.bot 2012-03-01 19:19:05 -0800 All reviewed patches have been landed. Closing bug. 129613 2012-02-29 19:11:17 -0800 2012-03-01 19:19:00 -0800 Patch bug-79998-20120301141115.patch text/plain 3525 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwOTI5NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDEyLTAyLTI5ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSGFuZGxlIENT U1Byb3BlcnR5V2Via2l0Qm9yZGVyRml0IGluIENTU1N0eWxlQXBwbHlQcm9wZXJ0eS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5OTk4CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIC8g cmVmYWN0b3Jpbmcgb25seS4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHku Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVBcHBseVByb3BlcnR5OjpDU1NTdHlsZUFw cGx5UHJvcGVydHkpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmNvbGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlz dCk6CisKIDIwMTItMDItMjkgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIE1ldGhvZHMgaW4gU2hhZG93VHJlZSBhbmQgVHJlZVNjb3BlQWRvcHRlciBz aG91bGQgYmUgbXVsdGlwbGUgc2hhZG93IHJvb3RzIGF3YXJlLgpJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJKHJldmlzaW9uIDEwOTI4NCkKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZUFwcGx5UHJvcGVydHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xODA5LDYgKzE4MDksNyBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxl QXBwbHlQcm9wCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENTU1Byb3BlcnR5V2Via2l0QmFja2dy b3VuZENvbXBvc2l0ZSwgQXBwbHlQcm9wZXJ0eUZpbGxMYXllcjxDb21wb3NpdGVPcGVyYXRvciwg Q1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kQ29tcG9zaXRlLCBCYWNrZ3JvdW5kRmlsbExheWVy LCAmUmVuZGVyU3R5bGU6OmFjY2Vzc0JhY2tncm91bmRMYXllcnMsICZSZW5kZXJTdHlsZTo6YmFj a2dyb3VuZExheWVycywgJkZpbGxMYXllcjo6aXNDb21wb3NpdGVTZXQsICZGaWxsTGF5ZXI6OmNv bXBvc2l0ZSwgJkZpbGxMYXllcjo6c2V0Q29tcG9zaXRlLCAmRmlsbExheWVyOjpjbGVhckNvbXBv c2l0ZSwgJkZpbGxMYXllcjo6aW5pdGlhbEZpbGxDb21wb3NpdGUsICZDU1NTdHlsZVNlbGVjdG9y OjptYXBGaWxsQ29tcG9zaXRlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhh bmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kT3JpZ2luLCBDU1NQcm9wZXJ0eUJhY2tn cm91bmRPcmlnaW4pOwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eVdlYmtpdEJh Y2tncm91bmRTaXplLCBDU1NQcm9wZXJ0eUJhY2tncm91bmRTaXplKTsKKyAgICBzZXRQcm9wZXJ0 eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJGaXQsIEFwcGx5UHJvcGVydHlEZWZhdWx0 PEVCb3JkZXJGaXQsICZSZW5kZXJTdHlsZTo6Ym9yZGVyRml0LCBFQm9yZGVyRml0LCAmUmVuZGVy U3R5bGU6OnNldEJvcmRlckZpdCwgRUJvcmRlckZpdCwgJlJlbmRlclN0eWxlOjppbml0aWFsQm9y ZGVyRml0Pjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJv cGVydHlXZWJraXRCb3JkZXJIb3Jpem9udGFsU3BhY2luZywgQXBwbHlQcm9wZXJ0eUNvbXB1dGVM ZW5ndGg8c2hvcnQsICZSZW5kZXJTdHlsZTo6aG9yaXpvbnRhbEJvcmRlclNwYWNpbmcsICZSZW5k ZXJTdHlsZTo6c2V0SG9yaXpvbnRhbEJvcmRlclNwYWNpbmcsICZSZW5kZXJTdHlsZTo6aW5pdGlh bEhvcml6b250YWxCb3JkZXJTcGFjaW5nPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9w ZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJJbWFnZSwgQXBwbHlQcm9wZXJ0eUJv cmRlckltYWdlPEltYWdlLCBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlckltYWdlLCAmUmVuZGVyU3R5 bGU6OmJvcmRlckltYWdlLCAmUmVuZGVyU3R5bGU6OnNldEJvcmRlckltYWdlPjo6Y3JlYXRlSGFu ZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJS YWRpdXMsIENTU1Byb3BlcnR5Qm9yZGVyUmFkaXVzKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz cy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9uIDEwOTI4NCkKKysrIFNvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzUwNyw5ICszNTA3 LDYgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICBz ZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KLSAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyRml0OgotICAgICAgICBIQU5ETEVf SU5IRVJJVF9BTkRfSU5JVElBTF9BTkRfUFJJTUlUSVZFKGJvcmRlckZpdCwgQm9yZGVyRml0KTsK LSAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUZXh0U2l6ZUFkanVz dDogewogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElBTCh0ZXh0U2l6ZUFkanVzdCwg VGV4dFNpemVBZGp1c3QpCiAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUgfHwgIXByaW1pdGl2 ZVZhbHVlLT5nZXRJZGVudCgpKQpAQCAtMzk1Nyw2ICszOTU0LDcgQEAgdm9pZCBDU1NTdHlsZVNl bGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCYWNr Z3JvdW5kQ29tcG9zaXRlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kT3Jp Z2luOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRCYWNrZ3JvdW5kU2l6ZToKKyAgICBjYXNl IENTU1Byb3BlcnR5V2Via2l0Qm9yZGVyRml0OgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRC b3JkZXJIb3Jpem9udGFsU3BhY2luZzoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0Qm9yZGVy SW1hZ2U6CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEJvcmRlclJhZGl1czoK