114339 2013-04-10 01:04:01 -0700 [BlackBerry] RenderThemeBlackBerry: get rid of all the SKIA code 2013-04-10 02:46:16 -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 oldest_to_newest 872641 0 berto 2013-04-10 01:04:01 -0700 Get rid of all the SKIA code in RenderThemeBlackBerry.cpp 872642 1 197219 berto 2013-04-10 01:05:16 -0700 Created attachment 197219 Patch 872677 2 197219 commit-queue 2013-04-10 02:46:15 -0700 Comment on attachment 197219 Patch Clearing flags on attachment: 197219 Committed r148087: <http://trac.webkit.org/changeset/148087> 872678 3 commit-queue 2013-04-10 02:46:16 -0700 All reviewed patches have been landed. Closing bug. 197219 2013-04-10 01:05:16 -0700 2013-04-10 02:46:15 -0700 Patch 114339.diff text/plain 7470 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhMTZkZDY4Li4xNDEwMGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTMtMDQtMTAgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtCbGFja0JlcnJ5XSBSZW5kZXJUaGVtZUJsYWNrQmVycnk6IGdldCByaWQgb2YgYWxs IHRoZSBTS0lBIGNvZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTExNDMzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhU2xpZGVy VHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5OjpwYWludE1l ZGlhU2xpZGVyVGh1bWIpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVCbGFja0JlcnJ5 OjpwYWludE1lZGlhVm9sdW1lU2xpZGVyVHJhY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVCbGFja0JlcnJ5OjpwYWludE1lZGlhVm9sdW1lU2xpZGVyVGh1bWIpOgorCiAyMDEzLTA0 LTEwICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OIChyMTQ3NzE5KTogRmFpbHVyZXMgaW4gdHdvIGExMXkgdGVzdHMgb24gR1RLCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRoZW1lQmxh Y2tCZXJyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L1JlbmRlclRo ZW1lQmxhY2tCZXJyeS5jcHAKaW5kZXggYmI5NDU0ZC4uZmMyNGJjNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9SZW5kZXJUaGVtZUJsYWNrQmVycnkuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvUmVuZGVyVGhlbWVCbGFj a0JlcnJ5LmNwcApAQCAtOTQ5LDE4ICs5NDksNyBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJy eTo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYQog CiAgICAgSW50UmVjdCBwbGF5ZWQoeCwgeSwgd1BsYXllZCwgaCk7CiAgICAgSW50UmVjdCBidWZm ZXJlZCh4LCB5LCB3TG9hZGVkID4gdyA/IHcgOiB3TG9hZGVkLCBoKTsKLSNpZiBVU0UoU0tJQSkK LSAgICAvLyBUaGlzIGlzIHRvIHBhaW50IG1haW4gc2xpZGVyIGJhci4KLSAgICBib29sIHJlc3Vs dCA9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCByZWN0Mik7CiAKLSAg ICBpZiAobG9hZGVkID4gMCB8fCBwb3NpdGlvbiA+IDApIHsKLSAgICAgICAgLy8gVGhpcyBpcyB0 byBwYWludCBidWZmZXJlZCBiYXIuCi0gICAgICAgIHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVj dCwgcGFpbnRJbmZvLCBidWZmZXJlZCwgQ29sb3I6OmRhcmtHcmF5LCBDb2xvcjo6ZGFya0dyYXks IENvbG9yOjpkYXJrR3JheSwgQ29sb3I6OmRhcmtHcmF5KTsKLQotICAgICAgICAvLyBUaGlzIGlz IHRvIHBhaW50IHBsYXllZCBwYXJ0IG9mIGJhciAobGVmdCBvZiBzbGlkZXIgdGh1bWIpIHVzaW5n IHNlbGVjdGlvbiBjb2xvci4KLSAgICAgICAgcGFpbnRTbGlkZXJUcmFja1JlY3Qob2JqZWN0LCBw YWludEluZm8sIHBsYXllZCwgc2VsZWN0aW9uLCBzZWxlY3Rpb24sIHNlbGVjdGlvbiwgc2VsZWN0 aW9uKTsKLSAgICB9Ci0jZWxzZSAvLyBHTCByZW5kZXJlcgogICAgIHN0YXRpYyBJbWFnZSogbWVk aWFCYWNrZ3JvdW5kID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX3NsaWRlcl92 aWRlb19iZyIpLmxlYWtSZWYoKTsKICAgICBzdGF0aWMgSW1hZ2UqIG1lZGlhUGxheWVyID0gSW1h Z2U6OmxvYWRQbGF0Zm9ybVJlc291cmNlKCJjb3JlX3NsaWRlcl9wbGF5ZWRfYmciKS5sZWFrUmVm KCk7CiAgICAgc3RhdGljIEltYWdlKiBtZWRpYUNhY2hlID0gSW1hZ2U6OmxvYWRQbGF0Zm9ybVJl c291cmNlKCJjb3JlX3NsaWRlcl9jYWNoZSIpLmxlYWtSZWYoKTsKQEAgLTk3NCw3ICs5NjMsNyBA QCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRyYWNrKFJlbmRl ck9iamVjdCogb2JqZWN0LCBjb25zdCBQYQogICAgICAgICAvLyBUaGlzIGlzIHRvIHBhaW50IHBs YXllZCBwYXJ0IG9mIGJhciAobGVmdCBvZiBzbGlkZXIgdGh1bWIpIHVzaW5nIHNlbGVjdGlvbiBj b2xvci4KICAgICAgICAgcGFpbnRTbGlkZXJUcmFja1JlY3Qob2JqZWN0LCBwYWludEluZm8sIHBs YXllZCwgbWVkaWFQbGF5ZXIpOwogICAgIH0KLSNlbmRpZiAvLyBVU0UoU0tJQSkKKwogICAgIHJl dHVybiByZXN1bHQ7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvYmplY3QpOwpAQCAtOTg3LDMw ICs5NzYsNiBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVNsaWRlclRy YWNrKFJlbmRlck9iamVjdCogb2JqZWN0LCBjb25zdCBQYQogYm9vbCBSZW5kZXJUaGVtZUJsYWNr QmVycnk6OnBhaW50TWVkaWFTbGlkZXJUaHVtYihSZW5kZXJPYmplY3QqIG9iamVjdCwgY29uc3Qg UGFpbnRJbmZvJiBwYWludEluZm8sIGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAjaWYgRU5BQkxF KFZJREVPKQotI2lmIFVTRShTS0lBKQotICAgIFJlbmRlclNsaWRlciogc2xpZGVyID0gZGV0ZXJt aW5lUmVuZGVyU2xpZGVyKG9iamVjdCk7Ci0gICAgaWYgKCFzbGlkZXIpCi0gICAgICAgIHJldHVy biBmYWxzZTsKLQotICAgIGZsb2F0IGZ1bGxTY3JlZW5NdWx0aXBsaWVyID0gZGV0ZXJtaW5lRnVs bFNjcmVlbk11bHRpcGxpZXIodG9FbGVtZW50KHNsaWRlci0+bm9kZSgpKSk7Ci0KLSAgICBwYWlu dEluZm8uY29udGV4dC0+c2F2ZSgpOwotICAgIFBhdGggbWVkaWFUaHVtYlJvdW5kZWRSZWN0YW5n bGU7Ci0gICAgbWVkaWFUaHVtYlJvdW5kZWRSZWN0YW5nbGUuYWRkUm91bmRlZFJlY3QocmVjdCwg RmxvYXRTaXplKG1lZGlhU2xpZGVyVGh1bWJSYWRpdXMgKiBmdWxsU2NyZWVuTXVsdGlwbGllciwg bWVkaWFTbGlkZXJUaHVtYlJhZGl1cyAqIGZ1bGxTY3JlZW5NdWx0aXBsaWVyKSk7Ci0gICAgcGFp bnRJbmZvLmNvbnRleHQtPnNldFN0cm9rZVN0eWxlKFNvbGlkU3Ryb2tlKTsKLSAgICBwYWludElu Zm8uY29udGV4dC0+c2V0U3Ryb2tlVGhpY2tuZXNzKDAuNSk7Ci0gICAgcGFpbnRJbmZvLmNvbnRl eHQtPnNldFN0cm9rZUNvbG9yKENvbG9yOjpibGFjaywgQ29sb3JTcGFjZURldmljZVJHQik7Ci0K LSAgICBpZiAoaXNQcmVzc2VkKG9iamVjdCkgfHwgaXNIb3ZlcmVkKG9iamVjdCkgfHwgc2xpZGVy LT5pbkRyYWdNb2RlKCkpCi0gICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5zZXRGaWxsR3JhZGll bnQoY3JlYXRlTGluZWFyR3JhZGllbnQoc2VsZWN0aW9uLCBDb2xvcihzZWxlY3Rpb24pLmRhcmso KS5yZ2IoKSwgcmVjdC5tYXhYTWluWUNvcm5lcigpLCByZWN0Lm1heFhNYXhZQ29ybmVyKCkpKTsK LSAgICBlbHNlCi0gICAgICAgIHBhaW50SW5mby5jb250ZXh0LT5zZXRGaWxsR3JhZGllbnQoY3Jl YXRlTGluZWFyR3JhZGllbnQoQ29sb3I6OndoaXRlLCBDb2xvcihDb2xvcjo6d2hpdGUpLmRhcmso KS5yZ2IoKSwgcmVjdC5tYXhYTWluWUNvcm5lcigpLCByZWN0Lm1heFhNYXhZQ29ybmVyKCkpKTsK LQotICAgIHBhaW50SW5mby5jb250ZXh0LT5maWxsUGF0aChtZWRpYVRodW1iUm91bmRlZFJlY3Rh bmdsZSk7Ci0gICAgcGFpbnRJbmZvLmNvbnRleHQtPnJlc3RvcmUoKTsKLQotICAgIHJldHVybiB0 cnVlOwotI2Vsc2UgLy8gR0wgcmVuZGVyZXIKICAgICBzdGF0aWMgSW1hZ2UqIGRpc2FibGVkTWVk aWFTbGlkZXJUaHVtYiA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9zbGlkZXJf aGFuZGxlX2Rpc2FibGVkIikubGVha1JlZigpOwogICAgIHN0YXRpYyBJbWFnZSogcHJlc3NlZE1l ZGlhU2xpZGVyVGh1bWIgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoImNvcmVfc2xpZGVy X2hhbmRsZV9wcmVzc2VkIikubGVha1JlZigpOwogICAgIHN0YXRpYyBJbWFnZSogbWVkaWFTbGlk ZXJUaHVtYiA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgiY29yZV9tZWRpYV9oYW5kbGUi KS5sZWFrUmVmKCk7CkBAIC0xMDIwLDcgKzk4NSw2IEBAIGJvb2wgUmVuZGVyVGhlbWVCbGFja0Jl cnJ5OjpwYWludE1lZGlhU2xpZGVyVGh1bWIoUmVuZGVyT2JqZWN0KiBvYmplY3QsIGNvbnN0IFBh CiAgICAgaWYgKGlzUHJlc3NlZChvYmplY3QpIHx8IGlzSG92ZXJlZChvYmplY3QpIHx8IGlzRm9j dXNlZChvYmplY3QpKQogICAgICAgICByZXR1cm4gcGFpbnRNZWRpYUJ1dHRvbihwYWludEluZm8u Y29udGV4dCwgcmVjdCwgcHJlc3NlZE1lZGlhU2xpZGVyVGh1bWIpOwogICAgIHJldHVybiBwYWlu dE1lZGlhQnV0dG9uKHBhaW50SW5mby5jb250ZXh0LCByZWN0LCBtZWRpYVNsaWRlclRodW1iKTsK LSNlbmRpZiAvLyBVU0UoU0tJQSkKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG9iamVjdCk7CiAg ICAgVU5VU0VEX1BBUkFNKHBhaW50SW5mbyk7CkBAIC0xMDQ3LDE1ICsxMDExLDYgQEAgYm9vbCBS ZW5kZXJUaGVtZUJsYWNrQmVycnk6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhSZW5kZXJP YmplY3QqIG9iamVjdCwgY28KICAgICBJbnRSZWN0IHJlY3QyKHgsIHksIHcsIGgpOwogICAgIElu dFJlY3Qgdm9sdW1lUmVjdCh4LCB5LCBjZWlsKHcgKiB2b2x1bWUpLCBoKTsKIAotI2lmIFVTRShT S0lBKQotICAgIC8vIFRoaXMgaXMgdG8gcGFpbnQgbWFpbiB2b2x1bWUgc2xpZGVyIGJhci4KLSAg ICBib29sIHJlc3VsdCA9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCBy ZWN0MiwgQ29sb3IobWVkaWFTbGlkZXJUcmFja091dGxpbmUpLnJnYigpLCBDb2xvcihtZWRpYVNs aWRlclRyYWNrT3V0bGluZSkucmdiKCksIHJhbmdlU2xpZGVyUmVndWxhclRvcCwgcmFuZ2VTbGlk ZXJSZWd1bGFyVG9wKTsKLQotICAgIGlmICh2b2x1bWUgPiAwKSB7Ci0gICAgICAgIC8vIFRoaXMg aXMgdG8gcGFpbnQgdm9sdW1lIGJhciAobGVmdCBvZiB2b2x1bWUgc2xpZGVyIHRodW1iKSB1c2lu ZyBzZWxlY3Rpb24gY29sb3IuCi0gICAgICAgIHJlc3VsdCB8PSBwYWludFNsaWRlclRyYWNrUmVj dChvYmplY3QsIHBhaW50SW5mbywgdm9sdW1lUmVjdCwgQ29sb3IobWVkaWFTbGlkZXJUcmFja091 dGxpbmUpLnJnYigpLCBDb2xvcihtZWRpYVNsaWRlclRyYWNrT3V0bGluZSkucmdiKCksIHNlbGVj dGlvbiwgc2VsZWN0aW9uKTsKLSAgICB9Ci0jZWxzZSAvLyBHTCByZW5kZXJlcgogICAgIHN0YXRp YyBJbWFnZSogdm9sdW1lQmFja2dyb3VuZCA9IEltYWdlOjpsb2FkUGxhdGZvcm1SZXNvdXJjZSgi Y29yZV9zbGlkZXJfdmlkZW9fYmciKS5sZWFrUmVmKCk7CiAgICAgc3RhdGljIEltYWdlKiB2b2x1 bWVCYXIgPSBJbWFnZTo6bG9hZFBsYXRmb3JtUmVzb3VyY2UoImNvcmVfc2xpZGVyX3BsYXllZF9i ZyIpLmxlYWtSZWYoKTsKIApAQCAtMTA2Niw3ICsxMDIxLDcgQEAgYm9vbCBSZW5kZXJUaGVtZUJs YWNrQmVycnk6OnBhaW50TWVkaWFWb2x1bWVTbGlkZXJUcmFjayhSZW5kZXJPYmplY3QqIG9iamVj dCwgY28KICAgICAgICAgLy8gVGhpcyBpcyB0byBwYWludCB2b2x1bWUgYmFyIChsZWZ0IG9mIHZv bHVtZSBzbGlkZXIgdGh1bWIpIHVzaW5nIHNlbGVjdGlvbiBjb2xvci4KICAgICAgICAgcmVzdWx0 IHw9IHBhaW50U2xpZGVyVHJhY2tSZWN0KG9iamVjdCwgcGFpbnRJbmZvLCB2b2x1bWVSZWN0LCB2 b2x1bWVCYXIpOwogICAgIH0KLSNlbmRpZiAvLyBVU0UoU0tJQSkKKwogICAgIHJldHVybiByZXN1 bHQ7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvYmplY3QpOwpAQCAtMTA4MiwyNyArMTAzNywx MSBAQCBib29sIFJlbmRlclRoZW1lQmxhY2tCZXJyeTo6cGFpbnRNZWRpYVZvbHVtZVNsaWRlclRo dW1iKFJlbmRlck9iamVjdCogb2JqZWN0LCBjbwogICAgIFJlbmRlclNsaWRlciogc2xpZGVyID0g ZGV0ZXJtaW5lUmVuZGVyU2xpZGVyKG9iamVjdCk7CiAgICAgZmxvYXQgZnVsbFNjcmVlbk11bHRp cGxpZXIgPSBzbGlkZXIgPyBkZXRlcm1pbmVGdWxsU2NyZWVuTXVsdGlwbGllcih0b0VsZW1lbnQo c2xpZGVyLT5ub2RlKCkpKSA6IDE7CiAKLSNpZiBVU0UoU0tJQSkKLSAgICBwYWludEluZm8uY29u dGV4dC0+c2F2ZSgpOwotICAgIFBhdGggbWVkaWFUaHVtYlJvdW5kZWRSZWN0YW5nbGU7Ci0gICAg bWVkaWFUaHVtYlJvdW5kZWRSZWN0YW5nbGUuYWRkUm91bmRlZFJlY3QocmVjdCwgRmxvYXRTaXpl KG1lZGlhU2xpZGVyVGh1bWJIZWlnaHQgLyAyICogZnVsbFNjcmVlbk11bHRpcGxpZXIsIG1lZGlh U2xpZGVyVGh1bWJIZWlnaHQgLyAyICogZnVsbFNjcmVlbk11bHRpcGxpZXIpKTsKLQotICAgIGlm IChpc1ByZXNzZWQob2JqZWN0KSB8fCBpc0hvdmVyZWQob2JqZWN0KSB8fCBzbGlkZXItPmluRHJh Z01vZGUoKSkKLSAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPnNldEZpbGxHcmFkaWVudChjcmVh dGVMaW5lYXJHcmFkaWVudChzZWxlY3Rpb24sIENvbG9yKHNlbGVjdGlvbikuZGFyaygpLnJnYigp LCByZWN0Lm1heFhNaW5ZQ29ybmVyKCksIHJlY3QubWF4WE1heFlDb3JuZXIoKSkpOwotICAgIGVs c2UKLSAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPnNldEZpbGxHcmFkaWVudChjcmVhdGVMaW5l YXJHcmFkaWVudChtZWRpYVNsaWRlclRyYWNrT3V0bGluZSwgQ29sb3I6OmJsYWNrLCByZWN0Lm1h eFhNaW5ZQ29ybmVyKCksIHJlY3QubWF4WE1heFlDb3JuZXIoKSkpOwotCi0gICAgcGFpbnRJbmZv LmNvbnRleHQtPmZpbGxQYXRoKG1lZGlhVGh1bWJSb3VuZGVkUmVjdGFuZ2xlKTsKLSAgICBwYWlu dEluZm8uY29udGV4dC0+cmVzdG9yZSgpOwotCi0gICAgcmV0dXJuIHRydWU7Ci0jZWxzZSAvLyBH TCByZW5kZXJlcgogICAgIGludCBpbnRyaW5zaWNIZWlnaHQgPSBjZWlsKG1lZGlhU2xpZGVyVGh1 bWJIZWlnaHQgLyA0KTsKICAgICBpbnQgeSA9IGNlaWwocmVjdC55KCkgKyAobWVkaWFDb250cm9s c0hlaWdodCAvIDIgLSBpbnRyaW5zaWNIZWlnaHQgLyAyKSAvIDIgKiBmdWxsU2NyZWVuTXVsdGlw bGllcik7CiAgICAgSW50UmVjdCBhZGp1c3RlZFJlY3QocmVjdC54KCksIHksIHJlY3Qud2lkdGgo KSwgcmVjdC5oZWlnaHQoKSk7CiAKICAgICByZXR1cm4gcGFpbnRNZWRpYVNsaWRlclRodW1iKG9i amVjdCwgcGFpbnRJbmZvLCBhZGp1c3RlZFJlY3QpOwotI2VuZGlmIC8vIFVTRShTS0lBKQogI2Vs c2UKICAgICBVTlVTRURfUEFSQU0ob2JqZWN0KTsKICAgICBVTlVTRURfUEFSQU0ocGFpbnRJbmZv KTsK