78741 2012-02-15 14:10:59 -0800 TileCache needs to support setting the contents scale 2012-02-15 23:39:34 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca webkit.review.bot oldest_to_newest 557538 0 andersca 2012-02-15 14:10:59 -0800 TileCache needs to support setting the contents scale 557539 1 127234 andersca 2012-02-15 14:12:41 -0800 Created attachment 127234 Patch 557585 2 andersca 2012-02-15 14:48:48 -0800 Committed r107843: <http://trac.webkit.org/changeset/107843> 557948 3 webkit.review.bot 2012-02-15 23:39:34 -0800 Attachment 127234 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource From git://git.webkit.org/WebKit a21bbd6..8e285bc master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 107895 = a21bbd6f17aa576ecd1a66c7faa07f44e01c90de r107896 = 8e285bc85619935cedfcd1a66ad0e0f6bce9ccb5 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc M LayoutTests/ChangeLog M Source/WebCore/ChangeLog r107897 = 05fb97d0fc2d24b504eb2c45dda5211bb467c1b0 (refs/remotes/origin/master) First, rewinding head to replay your work on top of it... Applying: dataTransfer.types (HTML5 drag & drop) should return DOMStringList Using index info to reconstruct a base tree... <stdin>:84: trailing whitespace. <stdin>:333: trailing whitespace. <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" <stdin>:334: trailing whitespace. width="300" height="300" onload="runRepaintTest()"> <stdin>:335: trailing whitespace. <script xlink:href="../../fast/repaint/resources/repaint.js" /> <stdin>:336: trailing whitespace. <script><![CDATA[ warning: squelched 16 whitespace errors warning: 21 lines add whitespace errors. Falling back to patching base and 3-way merge... Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Failed to merge in the changes. Patch failed at 0001 dataTransfer.types (HTML5 drag & drop) should return DOMStringList 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. If any of these errors are false positives, please file a bug against check-webkit-style. 127234 2012-02-15 14:12:41 -0800 2012-02-15 14:47:19 -0800 Patch bug-78741-20120215141239.patch text/plain 4293 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3ODM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjc5YTE5N2E3OGM5MTll N2QyNDAwNjdiN2ZhYjBmNjZmNTc5NDI4ZC4uMzlhOTBlNjZlZjYyNDA0ODJkNzMyOWU5MTdkYjI5 OGY1MjdiYmFjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4IEBACiAyMDEyLTAyLTE1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgVGlsZUNhY2hlIG5l ZWRzIHRvIHN1cHBvcnQgc2V0dGluZyB0aGUgY29udGVudHMgc2NhbGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4NzQxCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8xMDcxMDc3Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBObyBuZXcgdGVzdHMuIChPT1BTISkKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9j YS9tYWMvVGlsZUNhY2hlLm1tOgorICAgICAgICAoV2ViQ29yZTo6VGlsZUNhY2hlOjpzZXRDb250 ZW50c1NjYWxlKToKKyAgICAgICAgVXBkYXRlIHRoZSBjb250ZW50cyBzY2FsZSBvZiBhbGwgdGhl IHRpbGVzIGFuZCB0aGVuIHJldmFsaWRhdGUgdGhlIHRpbGUgY2FjaGUgc2luY2UgdGlsZXMKKyAg ICAgICAgbWlnaHQgaGF2ZSBjb21lIGFuZCBnb25lIGFzIGEgcmVzdWx0IG9mIHNldHRpbmcgdGhl IGNvbnRlbnRzIHNjYWxlLgorICAgICAgICAKKyAgICAgICAgKFdlYkNvcmU6OlRpbGVDYWNoZTo6 Y3JlYXRlVGlsZUxheWVyKToKKyAgICAgICAgU2V0IHRoZSBjb250ZW50cyBzY2FsZSBvZiB0aGUg dGlsZSBsYXllci4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9XZWJUaWxl Q2FjaGVMYXllci5tbToKKyAgICAgICAgKC1bV2ViVGlsZUNhY2hlTGF5ZXIgc2V0Q29udGVudHNT Y2FsZTpdKToKKyAgICAgICAgQ2FsbCBUaWxlQ2FjaGU6OnNldENvbnRlbnRzU2NhbGUuCisKKzIw MTItMDItMTUgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAg ICBXaGVlbCBldmVudHMgc2hvdWxkIGJlIHJlLWRpc3BhdGNoZWQgdG8gdGhlIHNjcm9sbGluZyB0 aHJlYWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc4 NzMxCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDg2NjE0ND4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUuaAppbmRleCAyYzI5MGU1 MDAwYzM1NTBmMGFkMGMyYzYzODg5MWEwZjhhOTBkYTA5Li43N2E4ODAwODYyNzgwZGNlZDA4YjQw ZThlYzEyY2ZkYzg3ZGYwYjZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5oCkBAIC01NSw2ICs1NSw3IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldE5lZWRzRGlzcGxheSgpOwogICAgIHZvaWQgc2V0TmVlZHNEaXNwbGF5SW5SZWN0 KGNvbnN0IEludFJlY3QmKTsKICAgICB2b2lkIGRyYXdMYXllcihXZWJUaWxlTGF5ZXIqLCBDR0Nv bnRleHRSZWYpOworICAgIHZvaWQgc2V0Q29udGVudHNTY2FsZShDR0Zsb2F0KTsKIAogICAgIGJv b2wgYWNjZWxlcmF0ZXNEcmF3aW5nKCkgY29uc3QgeyByZXR1cm4gbV9hY2NlbGVyYXRlc0RyYXdp bmc7IH0KICAgICB2b2lkIHNldEFjY2VsZXJhdGVzRHJhd2luZyhib29sKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9tYWMvVGlsZUNhY2hlLm1tCmluZGV4 IGRhODZhYWQ1YTc2YzQzZTYxNzY5MmMyNWI0ODc5YzI2OTU0ZTNlYjcuLmNkZDgxODNiY2M0OWQy MTg3MjNkNmI4YjhlOTM1NzZhNzE3YmJkMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2NhL21hYy9UaWxlQ2FjaGUubW0KKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2EvbWFjL1RpbGVDYWNoZS5tbQpAQCAtMTU2LDYgKzE1NiwxOCBA QCB2b2lkIFRpbGVDYWNoZTo6ZHJhd0xheWVyKFdlYlRpbGVMYXllciogbGF5ZXIsIENHQ29udGV4 dFJlZiBjb250ZXh0KQogICAgIENHQ29udGV4dFJlc3RvcmVHU3RhdGUoY29udGV4dCk7CiB9CiAK K3ZvaWQgVGlsZUNhY2hlOjpzZXRDb250ZW50c1NjYWxlKENHRmxvYXQgY29udGVudHNTY2FsZSkK K3sKKyAgICBmb3IgKFRpbGVNYXA6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV90aWxlcy5iZWdpbigp LCBlbmQgPSBtX3RpbGVzLmVuZCgpOyBpdCAhPSBlbmQ7ICsraXQpIHsKKyAgICAgICAgW2l0LT5z ZWNvbmQuZ2V0KCkgc2V0Q29udGVudHNTY2FsZTpjb250ZW50c1NjYWxlXTsKKyAgICAgICAgW2l0 LT5zZWNvbmQuZ2V0KCkgc2V0TmVlZHNEaXNwbGF5XTsKKyAgICB9CisKKyAgICBQbGF0Zm9ybUNB TGF5ZXIqIHBsYXRmb3JtTGF5ZXIgPSBQbGF0Zm9ybUNBTGF5ZXI6OnBsYXRmb3JtQ0FMYXllciht X3RpbGVDYWNoZUxheWVyKTsKKyAgICBwbGF0Zm9ybUxheWVyLT5vd25lcigpLT5wbGF0Zm9ybUNB TGF5ZXJEaWRDcmVhdGVUaWxlcygpOworICAgIHJldmFsaWRhdGVUaWxlcygpOworfQorCiB2b2lk IFRpbGVDYWNoZTo6c2V0QWNjZWxlcmF0ZXNEcmF3aW5nKGJvb2wgYWNjZWxlcmF0ZXNEcmF3aW5n KQogewogI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxE SU5HX09OX1NOT1dfTEVPUEFSRCkKQEAgLTMzMiw2ICszNDQsNyBAQCBSZXRhaW5QdHI8V2ViVGls ZUxheWVyPiBUaWxlQ2FjaGU6OmNyZWF0ZVRpbGVMYXllcigpCiAgICAgW2xheWVyLmdldCgpIHNl dEJvcmRlckNvbG9yOm1fdGlsZURlYnVnQm9yZGVyQ29sb3IuZ2V0KCldOwogICAgIFtsYXllci5n ZXQoKSBzZXRCb3JkZXJXaWR0aDptX3RpbGVEZWJ1Z0JvcmRlcldpZHRoXTsKICAgICBbbGF5ZXIu Z2V0KCkgc2V0RWRnZUFudGlhbGlhc2luZ01hc2s6MF07CisgICAgW2xheWVyLmdldCgpIHNldENv bnRlbnRzU2NhbGU6W21fdGlsZUNhY2hlTGF5ZXIgY29udGVudHNTY2FsZV1dOwogCiAjaWYgIWRl ZmluZWQoQlVJTERJTkdfT05fTEVPUEFSRCkgJiYgIWRlZmluZWQoQlVJTERJTkdfT05fU05PV19M RU9QQVJEKQogICAgIFtsYXllci5nZXQoKSBzZXRBY2NlbGVyYXRlc0RyYXdpbmc6bV9hY2NlbGVy YXRlc0RyYXdpbmddOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvbWFjL1dlYlRpbGVDYWNoZUxheWVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2EvbWFjL1dlYlRpbGVDYWNoZUxheWVyLm1tCmluZGV4IDA1OWYxNzc3YzE2ZTJi ZDA3ZDAxYTBlZTJmMzExOGUyMDQzYjA5ODUuLmMwN2I1ZGYyMzdkNTIxMGY3NDkxODFhNTljNjI5 NmE1NWQ2MjY3YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2NhL21hYy9XZWJUaWxlQ2FjaGVMYXllci5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9tYWMvV2ViVGlsZUNhY2hlTGF5ZXIubW0KQEAgLTcyLDYgKzcyLDE2IEBA IHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogICAgIHJldHVybiBfdGlsZUNhY2hlLT5hY2NlbGVy YXRlc0RyYXdpbmcoKTsKIH0KIAorLSAodm9pZClzZXRDb250ZW50c1NjYWxlOihDR0Zsb2F0KWNv bnRlbnRzU2NhbGUKK3sKKyAgICBDR0Zsb2F0IG9sZENvbnRlbnRzU2NhbGUgPSBbc2VsZiBjb250 ZW50c1NjYWxlXTsKKworICAgIFtzdXBlciBzZXRDb250ZW50c1NjYWxlOmNvbnRlbnRzU2NhbGVd OworCisgICAgaWYgKGNvbnRlbnRzU2NhbGUgIT0gb2xkQ29udGVudHNTY2FsZSkKKyAgICAgICAg X3RpbGVDYWNoZS0+c2V0Q29udGVudHNTY2FsZShjb250ZW50c1NjYWxlKTsKK30KKwogLSAoQ0FM YXllciAqKXRpbGVDb250YWluZXJMYXllcgogewogICAgIHJldHVybiBfdGlsZUNhY2hlLT50aWxl Q29udGFpbmVyTGF5ZXIoKTsK