116658 2013-05-23 04:12:43 -0700 Path: upstream the missing bits from the BlackBerry port 2013-05-24 10:28:19 -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 xan.lopez oldest_to_newest 892737 0 berto 2013-05-23 04:12:43 -0700 PathBlackBerry was upstreamed a while ago (r144612) but a few bits are missing: - Its definition of PlatformPath. - The declaration of platformAddPathForRoundedRect(). 892738 1 202660 berto 2013-05-23 04:14:15 -0700 Created attachment 202660 Patch 892838 2 202660 xan.lopez 2013-05-23 06:24:45 -0700 Comment on attachment 202660 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202660&action=review > Source/WebCore/platform/graphics/Path.cpp:154 > platformAddPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius); Too bad this is needed, but since CG is doing exactly the same I guess it is acceptable. FWIW this method does not make a lot of sense for the non-CG/non-blackberry ports. They are always going to call 'addBeziersForRoundedRect'. Not sure if it's worth cleaning up in a follow-up though. > Source/WebCore/platform/graphics/Path.h:58 > +typedef BlackBerry::Platform::Graphics::Path PlatformPath; This makes sense. Too bad there seems to be no way to define nested namespaces in one go, it's kinda ugly .though. > Source/WebCore/platform/graphics/Path.h:174 > + Path(const PlatformPath&); This is not used in the patch right? Where is it used exactly? 892932 3 berto 2013-05-23 10:05:47 -0700 (In reply to comment #2) > > Source/WebCore/platform/graphics/Path.cpp:154 > > platformAddPathForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius); > > Too bad this is needed, but since CG is doing exactly the same I guess it is acceptable. > > FWIW this method does not make a lot of sense for the non-CG/non-blackberry ports. They are always going to call 'addBeziersForRoundedRect'. Not sure if it's worth cleaning up in a follow-up though. I guess I can try to clean it up in a separate patch. > > Source/WebCore/platform/graphics/Path.h:58 > > +typedef BlackBerry::Platform::Graphics::Path PlatformPath; > > This makes sense. Too bad there seems to be no way to define nested > > namespaces in one go, it's kinda ugly .though. One alternative would be something like namespace BlackBerry { namespace Platform { namespace Graphics { which looks a bit better IMO but I'm not sure if that's accepted style? JSC seems to use something like that... > > Source/WebCore/platform/graphics/Path.h:174 > > + Path(const PlatformPath&); > > This is not used in the patch right? Where is it used exactly? In DefaultTapHighlight::paintContents() at least. Path path(m_region.boundaryPath()); 893334 4 202660 xan.lopez 2013-05-24 09:43:29 -0700 Comment on attachment 202660 Patch I see a bunch of uses of the namespace FOO { namspace BAR { thing in Webcore too, so probably best to do that (I think it looks better). And also good to do the cleanup after this, I think. r- for the style thing. 893337 5 202830 berto 2013-05-24 09:48:14 -0700 Created attachment 202830 Patch So be it 893364 6 202830 commit-queue 2013-05-24 10:28:17 -0700 Comment on attachment 202830 Patch Clearing flags on attachment: 202830 Committed r150646: <http://trac.webkit.org/changeset/150646> 893365 7 commit-queue 2013-05-24 10:28:19 -0700 All reviewed patches have been landed. Closing bug. 202660 2013-05-23 04:14:15 -0700 2013-05-24 09:48:14 -0700 Patch 116658.diff text/plain 2817 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxZTJjMzRhLi41YmQ5MTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDUtMjMgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFBhdGg6IHVwc3RyZWFtIHRoZSBtaXNzaW5nIGJpdHMgZnJvbSB0aGUgQmxhY2tCZXJy eSBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTY2NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ YXRoQmxhY2tCZXJyeSB3YXMgdXBzdHJlYW1lZCBhIHdoaWxlIGFnbyAocjE0NDYxMikgYnV0IGEg ZmV3IGJpdHMKKyAgICAgICAgd2VyZSBtaXNzaW5nIGZyb20gdGhlIGNyb3NzLXBsYXRmb3JtIGNv ZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBhdGg6OmFkZFBhdGhGb3JSb3VuZGVkUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvUGF0aC5oOgorICAgICAgICAoR3JhcGhpY3MpOgorICAgICAgICAoUGF0aCk6CisK IDIwMTMtMDUtMjIgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgogCiAgICAgICAgIFJv bGxpbmcgb3V0IHIxNTA1NTUuIEl0IGJvcmtlZCBhYm91dCAzMCBtZWRpYSB0ZXN0cy4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAKaW5kZXggYTgxYjA0MC4uODAzMjky YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAKQEAgLTE1MCw3 ICsxNTAsNyBAQCB2b2lkIFBhdGg6OmFkZFBhdGhGb3JSb3VuZGVkUmVjdChjb25zdCBGbG9hdFJl Y3QmIHJlY3QsIGNvbnN0IEZsb2F0U2l6ZSYgdG9wTGVmdAogICAgICAgICByZXR1cm47CiAgICAg fQogCi0jaWYgVVNFKENHKQorI2lmIFVTRShDRykgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkKICAg ICBwbGF0Zm9ybUFkZFBhdGhGb3JSb3VuZGVkUmVjdChyZWN0LCB0b3BMZWZ0UmFkaXVzLCB0b3BS aWdodFJhZGl1cywgYm90dG9tTGVmdFJhZGl1cywgYm90dG9tUmlnaHRSYWRpdXMpOwogI2Vsc2UK ICAgICBhZGRCZXppZXJzRm9yUm91bmRlZFJlY3QocmVjdCwgdG9wTGVmdFJhZGl1cywgdG9wUmln aHRSYWRpdXMsIGJvdHRvbUxlZnRSYWRpdXMsIGJvdHRvbVJpZ2h0UmFkaXVzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguaAppbmRleCA0NzM0NTE5Li42MTBjYzcyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCkBAIC00Nyw2ICs0NywxNSBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgUGxhdGZvcm1QYXRoOwogfQogdHlwZWRlZiBX ZWJDb3JlOjpQbGF0Zm9ybVBhdGggUGxhdGZvcm1QYXRoOworI2VsaWYgUExBVEZPUk0oQkxBQ0tC RVJSWSkKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsKK25hbWVzcGFjZSBQbGF0Zm9ybSB7CituYW1l c3BhY2UgR3JhcGhpY3MgeworY2xhc3MgUGF0aDsKK30KK30KK30KK3R5cGVkZWYgQmxhY2tCZXJy eTo6UGxhdGZvcm06OkdyYXBoaWNzOjpQYXRoIFBsYXRmb3JtUGF0aDsKICNlbHNlCiB0eXBlZGVm IHZvaWQgUGxhdGZvcm1QYXRoOwogI2VuZGlmCkBAIC0xNTcsMTIgKzE2NiwxMiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgYWRkUGF0aEZvclJvdW5kZWRSZWN0KGNvbnN0IEZs b2F0UmVjdCYsIGNvbnN0IEZsb2F0U2l6ZSYgdG9wTGVmdFJhZGl1cywgY29uc3QgRmxvYXRTaXpl JiB0b3BSaWdodFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiBib3R0b21MZWZ0UmFkaXVzLCBjb25z dCBGbG9hdFNpemUmIGJvdHRvbVJpZ2h0UmFkaXVzLCBSb3VuZGVkUmVjdFN0cmF0ZWd5ID0gUHJl ZmVyTmF0aXZlUm91bmRlZFJlY3QpOwogICAgICAgICB2b2lkIGFkZEJlemllcnNGb3JSb3VuZGVk UmVjdChjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFNpemUmIHRvcExlZnRSYWRpdXMsIGNv bnN0IEZsb2F0U2l6ZSYgdG9wUmlnaHRSYWRpdXMsIGNvbnN0IEZsb2F0U2l6ZSYgYm90dG9tTGVm dFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiBib3R0b21SaWdodFJhZGl1cyk7CiAKLSNpZiBVU0Uo Q0cpCisjaWYgVVNFKENHKSB8fCBQTEFURk9STShCTEFDS0JFUlJZKQogICAgICAgICB2b2lkIHBs YXRmb3JtQWRkUGF0aEZvclJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEZsb2F0 U2l6ZSYgdG9wTGVmdFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiB0b3BSaWdodFJhZGl1cywgY29u c3QgRmxvYXRTaXplJiBib3R0b21MZWZ0UmFkaXVzLCBjb25zdCBGbG9hdFNpemUmIGJvdHRvbVJp Z2h0UmFkaXVzKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKLSAgICAgICAg UGF0aChjb25zdCBTa1BhdGgmKTsKKyAgICAgICAgUGF0aChjb25zdCBQbGF0Zm9ybVBhdGgmKTsK ICNlbmRpZgogCiAgICAgcHJpdmF0ZToK 202830 2013-05-24 09:48:14 -0700 2013-05-24 10:28:17 -0700 Patch 116658.diff text/plain 2877 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBlZGRiZWQyLi44NmIzMjgwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkg QEAKKzIwMTMtMDUtMjQgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFBhdGg6IHVwc3RyZWFtIHRoZSBtaXNzaW5nIGJpdHMgZnJvbSB0aGUgQmxhY2tCZXJy eSBwb3J0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTY2NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQ YXRoQmxhY2tCZXJyeSB3YXMgdXBzdHJlYW1lZCBhIHdoaWxlIGFnbyAocjE0NDYxMikgYnV0IGEg ZmV3IGJpdHMKKyAgICAgICAgd2VyZSBtaXNzaW5nIGZyb20gdGhlIGNyb3NzLXBsYXRmb3JtIGNv ZGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlBhdGg6OmFkZFBhdGhGb3JSb3VuZGVkUmVjdCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvUGF0aC5oOgorICAgICAgICAoR3JhcGhpY3MpOgorICAgICAgICAoUGF0aCk6CisK IDIwMTMtMDUtMjQgIE5vYW0gUm9zZW50aGFsICA8bm9hbUB3ZWJraXQub3JnPgogCiAgICAgICAg IFdlYlByb2Nlc3MgaXMgY3Jhc2hpbmcgb24gaHR0cDovL2FjaGljdS5naXRodWIuaW8vY3NzLXBy ZXNlbnRhdGlvbiB3aGVuIGRpcmVjdCBwYXR0ZXJuIGNvbXBvc2l0aW5nIGlzIGVuYWJsZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAKaW5kZXggYTgxYjA0MC4uODAz MjkyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5jcHAKQEAgLTE1 MCw3ICsxNTAsNyBAQCB2b2lkIFBhdGg6OmFkZFBhdGhGb3JSb3VuZGVkUmVjdChjb25zdCBGbG9h dFJlY3QmIHJlY3QsIGNvbnN0IEZsb2F0U2l6ZSYgdG9wTGVmdAogICAgICAgICByZXR1cm47CiAg ICAgfQogCi0jaWYgVVNFKENHKQorI2lmIFVTRShDRykgfHwgUExBVEZPUk0oQkxBQ0tCRVJSWSkK ICAgICBwbGF0Zm9ybUFkZFBhdGhGb3JSb3VuZGVkUmVjdChyZWN0LCB0b3BMZWZ0UmFkaXVzLCB0 b3BSaWdodFJhZGl1cywgYm90dG9tTGVmdFJhZGl1cywgYm90dG9tUmlnaHRSYWRpdXMpOwogI2Vs c2UKICAgICBhZGRCZXppZXJzRm9yUm91bmRlZFJlY3QocmVjdCwgdG9wTGVmdFJhZGl1cywgdG9w UmlnaHRSYWRpdXMsIGJvdHRvbUxlZnRSYWRpdXMsIGJvdHRvbVJpZ2h0UmFkaXVzKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1BhdGguaAppbmRleCA0NzM0NTE5Li45ZTlkZTU4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QYXRoLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvUGF0aC5oCkBAIC00Nyw2ICs0NywxMSBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgY2xhc3MgUGxhdGZvcm1QYXRoOwogfQogdHlwZWRl ZiBXZWJDb3JlOjpQbGF0Zm9ybVBhdGggUGxhdGZvcm1QYXRoOworI2VsaWYgUExBVEZPUk0oQkxB Q0tCRVJSWSkKK25hbWVzcGFjZSBCbGFja0JlcnJ5IHsgbmFtZXNwYWNlIFBsYXRmb3JtIHsgbmFt ZXNwYWNlIEdyYXBoaWNzIHsKKyAgICBjbGFzcyBQYXRoOworfSB9IH0KK3R5cGVkZWYgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpQYXRoIFBsYXRmb3JtUGF0aDsKICNlbHNlCiB0eXBl ZGVmIHZvaWQgUGxhdGZvcm1QYXRoOwogI2VuZGlmCkBAIC0xNTcsMTIgKzE2MiwxMiBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZvaWQgYWRkUGF0aEZvclJvdW5kZWRSZWN0KGNvbnN0 IEZsb2F0UmVjdCYsIGNvbnN0IEZsb2F0U2l6ZSYgdG9wTGVmdFJhZGl1cywgY29uc3QgRmxvYXRT aXplJiB0b3BSaWdodFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiBib3R0b21MZWZ0UmFkaXVzLCBj b25zdCBGbG9hdFNpemUmIGJvdHRvbVJpZ2h0UmFkaXVzLCBSb3VuZGVkUmVjdFN0cmF0ZWd5ID0g UHJlZmVyTmF0aXZlUm91bmRlZFJlY3QpOwogICAgICAgICB2b2lkIGFkZEJlemllcnNGb3JSb3Vu ZGVkUmVjdChjb25zdCBGbG9hdFJlY3QmLCBjb25zdCBGbG9hdFNpemUmIHRvcExlZnRSYWRpdXMs IGNvbnN0IEZsb2F0U2l6ZSYgdG9wUmlnaHRSYWRpdXMsIGNvbnN0IEZsb2F0U2l6ZSYgYm90dG9t TGVmdFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiBib3R0b21SaWdodFJhZGl1cyk7CiAKLSNpZiBV U0UoQ0cpCisjaWYgVVNFKENHKSB8fCBQTEFURk9STShCTEFDS0JFUlJZKQogICAgICAgICB2b2lk IHBsYXRmb3JtQWRkUGF0aEZvclJvdW5kZWRSZWN0KGNvbnN0IEZsb2F0UmVjdCYsIGNvbnN0IEZs b2F0U2l6ZSYgdG9wTGVmdFJhZGl1cywgY29uc3QgRmxvYXRTaXplJiB0b3BSaWdodFJhZGl1cywg Y29uc3QgRmxvYXRTaXplJiBib3R0b21MZWZ0UmFkaXVzLCBjb25zdCBGbG9hdFNpemUmIGJvdHRv bVJpZ2h0UmFkaXVzKTsKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oQkxBQ0tCRVJSWSkKLSAgICAg ICAgUGF0aChjb25zdCBTa1BhdGgmKTsKKyAgICAgICAgUGF0aChjb25zdCBQbGF0Zm9ybVBhdGgm KTsKICNlbmRpZgogCiAgICAgcHJpdmF0ZToK