114148 2013-04-08 00:41:09 -0700 [BlackBerry] WebPage: fix build due to type mismatches 2013-04-09 00:41:26 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111729 0 berto webkit-unassigned cgarcia commit-queue mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 870649 0 berto 2013-04-08 00:41:09 -0700 Add explicit conversions between LayoutUnit and int, and between LayoutRect and IntRect. 870651 1 196835 berto 2013-04-08 00:45:31 -0700 Created attachment 196835 Patch 870707 2 196835 rwlbuis 2013-04-08 04:34:24 -0700 Comment on attachment 196835 Patch What changed so that we need to do this? 871354 3 196835 commit-queue 2013-04-08 18:32:36 -0700 Comment on attachment 196835 Patch Clearing flags on attachment: 196835 Committed r147973: <http://trac.webkit.org/changeset/147973> 871355 4 commit-queue 2013-04-08 18:32:38 -0700 All reviewed patches have been landed. Closing bug. 871528 5 berto 2013-04-09 00:41:26 -0700 (In reply to comment #2) > (From update of attachment 196835 [details]) > What changed so that we need to do this? This was upstreamed on year ago (r108718) and I'm not sure if it ever compiled. For example, you can't implicitly convert LayoutUnit in this case because there are several candidates: error: ambiguous overload for 'operator+=' in 'xOffset += renderBlock->WebCore::RenderBlock::<anonymous>.WebCore::RenderBox::x()' note: candidates are: note: operator+=(int&, int) <built-in> note: operator+=(int&, unsigned int) <built-in> note: operator+=(int&, float) <built-in> note: operator+=(int&, double) <built-in> 196835 2013-04-08 00:45:31 -0700 2013-04-08 18:32:36 -0700 Patch 114148.diff text/plain 2381 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5jcHAgYi9T b3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQXBpL1dlYlBhZ2UuY3BwCmluZGV4IDU1YThhN2YuLmQw MzlmMTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvV2ViUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0FwaS9XZWJQYWdlLmNwcApAQCAtMjg3 MSwxNSArMjg3MSwxNSBAQCBJbnRSZWN0IFdlYlBhZ2VQcml2YXRlOjpyZWN0Rm9yTm9kZShOb2Rl KiBub2RlKQogICAgICAgICBpbnQgeE9mZnNldCA9IDA7CiAgICAgICAgIGludCB5T2Zmc2V0ID0g MDsKICAgICAgICAgd2hpbGUgKCFyZW5kZXJCbG9jay0+aXNSb290KCkpIHsKLSAgICAgICAgICAg IHhPZmZzZXQgKz0gcmVuZGVyQmxvY2stPngoKTsKLSAgICAgICAgICAgIHlPZmZzZXQgKz0gcmVu ZGVyQmxvY2stPnkoKTsKKyAgICAgICAgICAgIHhPZmZzZXQgKz0gcmVuZGVyQmxvY2stPngoKS50 b0ludCgpOworICAgICAgICAgICAgeU9mZnNldCArPSByZW5kZXJCbG9jay0+eSgpLnRvSW50KCk7 CiAgICAgICAgICAgICByZW5kZXJCbG9jayA9IHJlbmRlckJsb2NrLT5jb250YWluaW5nQmxvY2so KTsKICAgICAgICAgfQogICAgICAgICBjb25zdCBSZW5kZXJUZXh0KiByZW5kZXJUZXh0ID0gdG9S ZW5kZXJUZXh0KHJlbmRlcmVyKTsKICAgICAgICAgSW50UmVjdCBsaW5lc0JveCA9IHJlbmRlclRl eHQtPmxpbmVzQm91bmRpbmdCb3goKTsKICAgICAgICAgYmxvY2tSZWN0ID0gSW50UmVjdCh4T2Zm c2V0ICsgbGluZXNCb3gueCgpLCB5T2Zmc2V0ICsgbGluZXNCb3gueSgpLCBsaW5lc0JveC53aWR0 aCgpLCBsaW5lc0JveC5oZWlnaHQoKSk7CiAgICAgfSBlbHNlCi0gICAgICAgIGJsb2NrUmVjdCA9 IHJlbmRlcmVyLT5hYnNvbHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKTsKKyAgICAgICAgYmxvY2tS ZWN0ID0gSW50UmVjdChyZW5kZXJlci0+YWJzb2x1dGVDbGlwcGVkT3ZlcmZsb3dSZWN0KCkpOwog CiAgICAgaWYgKHJlbmRlcmVyLT5pc1RleHQoKSkgewogICAgICAgICBSZW5kZXJCbG9jayogcmIg PSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7CkBAIC0yODg4LDcgKzI4ODgsNyBAQCBJbnRS ZWN0IFdlYlBhZ2VQcml2YXRlOjpyZWN0Rm9yTm9kZShOb2RlKiBub2RlKQogICAgICAgICBpbnQg YmxvY2tXaWR0aCA9IDA7CiAgICAgICAgIGludCBsaW5lQ291bnQgPSByYi0+bGluZUNvdW50KCk7 CiAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbGluZUNvdW50OyBpKyspCi0gICAgICAgICAg ICBibG9ja1dpZHRoID0gbWF4KGJsb2NrV2lkdGgsIHJiLT5hdmFpbGFibGVMb2dpY2FsV2lkdGhG b3JMaW5lKGksIGZhbHNlKSk7CisgICAgICAgICAgICBibG9ja1dpZHRoID0gbWF4KGJsb2NrV2lk dGgsIHJiLT5hdmFpbGFibGVMb2dpY2FsV2lkdGhGb3JMaW5lKGksIGZhbHNlKS50b0ludCgpKTsK IAogICAgICAgICBibG9ja1JlY3Quc2V0V2lkdGgoYmxvY2tXaWR0aCk7CiAgICAgICAgIGJsb2Nr UmVjdC5zZXRYKGJsb2NrUmVjdC54KCkgKyByYi0+bG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKDEs IGZhbHNlKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0NoYW5nZUxvZwppbmRleCBmZmE2YTY2Li5kOWNl M2MzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAx My0wNC0wOCAgQWxiZXJ0byBHYXJjaWEgIDxhZ2FyY2lhQGlnYWxpYS5jb20+CisKKyAgICAgICAg W0JsYWNrQmVycnldIFdlYlBhZ2U6IGZpeCBidWlsZCBkdWUgdG8gdHlwZSBtaXNtYXRjaGVzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTQxNDgKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZXhwbGlj aXQgY29udmVyc2lvbnMgYmV0d2VlbiBMYXlvdXRVbml0IGFuZCBpbnQsIGFuZCBiZXR3ZWVuCisg ICAgICAgIExheW91dFJlY3QgYW5kIEludFJlY3QuCisKKyAgICAgICAgKiBBcGkvV2ViUGFnZS5j cHA6CisgICAgICAgIChCbGFja0JlcnJ5OjpXZWJLaXQ6OldlYlBhZ2VQcml2YXRlOjpyZWN0Rm9y Tm9kZSk6CisKIDIwMTMtMDQtMDUgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29t PgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgdW51c2VkIHBhcmFtZXRlcnMgZnJvbSBu b3RpZnlBbmltYXRpb25TdGFydGVkKCkgYW5kIHBhaW50Q29udGVudHMoKQo=