113936 2013-04-04 08:33:58 -0700 [BlackBerry] Remove skia code from PluginViewBlackBerry 2013-04-04 11:20:51 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot oldest_to_newest 869166 0 cgarcia 2013-04-04 08:33:58 -0700 It's currently unused by BlackBerry. 869168 1 196479 cgarcia 2013-04-04 08:35:27 -0700 Created attachment 196479 Patch 869227 2 196479 rwlbuis 2013-04-04 10:32:11 -0700 Comment on attachment 196479 Patch This seems to make sense. 869247 3 196479 webkit.review.bot 2013-04-04 11:20:48 -0700 Comment on attachment 196479 Patch Clearing flags on attachment: 196479 Committed r147654: <http://trac.webkit.org/changeset/147654> 869248 4 webkit.review.bot 2013-04-04 11:20:51 -0700 All reviewed patches have been landed. Closing bug. 196479 2013-04-04 08:35:27 -0700 2013-04-04 11:20:48 -0700 Patch bb-skia-plugins.diff text/plain 7501 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmYWY2NTE2Li4xOGMyZDhhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUg QEAKKzIwMTMtMDQtMDQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgc2tpYSBjb2RlIGZyb20gUGx1Z2luVmll d0JsYWNrQmVycnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTExMzkzNgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFNraWEgaXMgbm90IHVzZWQgYW55bW9yZSBieSB0aGUgQmxhY2tCZXJyeSBwb3J0LgorCisg ICAgICAgICogcGx1Z2lucy9ibGFja2JlcnJ5L1BsdWdpblZpZXdCbGFja0JlcnJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBsdWdpblZpZXc6OnBhaW50KToKKwogMjAxMy0wNC0wMiAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVy cnldIEltcGxlbWVudCBTY3JvbGxpbmdDb29yZGluYXRvcjo6ZnJhbWVWaWV3TGF5b3V0VXBkYXRl ZCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2lu Vmlld0JsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGx1Z2lucy9ibGFja2JlcnJ5L1Bs dWdpblZpZXdCbGFja0JlcnJ5LmNwcAppbmRleCA5MzdkOTY2Li43Njc4NGY4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbHVnaW5zL2JsYWNrYmVycnkvUGx1Z2luVmlld0JsYWNrQmVycnku Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsdWdpbnMvYmxhY2tiZXJyeS9QbHVnaW5WaWV3Qmxh Y2tCZXJyeS5jcHAKQEAgLTQzLDcgKzQzLDYgQEAKICNpbmNsdWRlICJOUENhbGxiYWNrc0JsYWNr QmVycnkuaCIKICNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgogI2luY2x1ZGUgIlBhZ2UuaCIK LSNpbmNsdWRlICJQbGF0Zm9ybUNvbnRleHRTa2lhLmgiCiAjaW5jbHVkZSAiUGxhdGZvcm1LZXli b2FyZEV2ZW50LmgiCiAjaW5jbHVkZSAiUGx1Z2luRGVidWcuaCIKICNpbmNsdWRlICJQbHVnaW5N YWluVGhyZWFkU2NoZWR1bGVyLmgiCkBAIC0yNDYsMTQ2ICsyNDUsNiBAQCB2b2lkIFBsdWdpblZp ZXc6OnBhaW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkK ICAgICBleHBvc2VkUmVjdC5tb3ZlKC1mcmFtZVJlY3QoKS54KCksIC1mcmFtZVJlY3QoKS55KCkp OwogCiAgICAgdXBkYXRlQnVmZmVyKGV4cG9zZWRSZWN0KTsKLQotICAgIFB0aHJlYWRSZWFkTG9j a2VyIGZyb250TG9jaygmbV9wcml2YXRlLT5tX2Zyb250QnVmZmVyUndMb2NrKTsKLQotICAgIEJs YWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6QnVmZmVyKiBmcm9udEJ1ZmZlciA9Ci0gICAg ICAgIG1fcHJpdmF0ZS0+bV9wbHVnaW5CdWZmZXJzW21fcHJpdmF0ZS0+bV9wbHVnaW5Gcm9udEJ1 ZmZlcl07Ci0KLSAgICAvLyBEb24ndCBwYWludCBhbnl0aGluZyBpZiB0aGVyZSBpcyBubyBidWZm ZXIuCi0gICAgaWYgKCFmcm9udEJ1ZmZlcikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgY29uc3Qg QmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpCYWNraW5nSW1hZ2UqIGJhY2tpbmdJbWFn ZSA9Ci0gICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGljczo6bG9ja0J1ZmZlckJh Y2tpbmdJbWFnZShmcm9udEJ1ZmZlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpHcmFwaGlj czo6UmVhZEFjY2Vzcyk7Ci0gICAgaWYgKCFiYWNraW5nSW1hZ2UpCi0gICAgICAgIHJldHVybjsK LQotICAgIC8vIERyYXcgdGhlIGNoYW5nZWQgYnVmZmVyIGNvbnRlbnRzIHRvIHRoZSBzY3JlZW4u Ci0gICAgY29udGV4dC0+c2F2ZSgpOwotCi0gICAgY29uc3QgU2tCaXRtYXAmIHBsdWdpbkltYWdl ID0gKmJhY2tpbmdJbWFnZTsKLSAgICBQbGF0Zm9ybUdyYXBoaWNzQ29udGV4dCogZ3JhcGhpY3Mg PSBjb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKTsKLSAgICBBU1NFUlQoZ3JhcGhpY3MpOwotICAg IFNrQ2FudmFzKiBjYW52YXMgPSBncmFwaGljcy0+Y2FudmFzKCk7Ci0KLSAgICAvLyBTb3VyY2Ug cmVjdGFuZ2xlIHdlIHdpbGwgZHJhdyB0byB0aGUgc2NyZWVuLgotICAgIFNrSVJlY3Qgc2tTcmNS ZWN0OwotICAgIHNrU3JjUmVjdC5zZXQoZXhwb3NlZFJlY3QueCgpLCBleHBvc2VkUmVjdC55KCks Ci0gICAgICAgICAgICAgICAgICBleHBvc2VkUmVjdC54KCkgKyBleHBvc2VkUmVjdC53aWR0aCgp LAotICAgICAgICAgICAgICAgICAgZXhwb3NlZFJlY3QueSgpICsgZXhwb3NlZFJlY3QuaGVpZ2h0 KCkpOwotCi0gICAgLy8gUHJlcGFyZSB0aGUgaG9sZSBwdW5jaCByZWN0YW5nbGUuCi0gICAgU2tJ UmVjdCB1bmNsaXBwZWRIb2xlUHVuY2hSZWN0OwotICAgIHVuY2xpcHBlZEhvbGVQdW5jaFJlY3Qu c2V0KG1fcHJpdmF0ZS0+bV9ob2xlUHVuY2hSZWN0LngoKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBtX3ByaXZhdGUtPm1faG9sZVB1bmNoUmVjdC55KCksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbV9wcml2YXRlLT5tX2hvbGVQdW5jaFJlY3QueCgpICsgbV9wcml2 YXRlLT5tX2hvbGVQdW5jaFJlY3Qud2lkdGgoKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBtX3ByaXZhdGUtPm1faG9sZVB1bmNoUmVjdC55KCkgKyBtX3ByaXZhdGUtPm1faG9sZVB1 bmNoUmVjdC5oZWlnaHQoKSk7Ci0KLSAgICAvLyBob2xlUHVuY2hSZWN0IGlzIGNsaXBwZWQuCi0g ICAgU2tJUmVjdCBob2xlUHVuY2hSZWN0OwotCi0gICAgLy8gQWxsIHNvdXJjZSByZWN0YW5nbGVz IGFyZSBzY2FsZWQgYnkgdGhlIHpvb20gZmFjdG9yIGJlY2F1c2UgdGhlIHNvdXJjZSBiaXRtYXAg bWF5IGJlIGEKLSAgICAvLyBoaWdoZXIgcmVzb2x1dGlvbiB0aGFuIHRoZSAxOjEgcGFnZS4gVGhp cyBhbGxvd3MgdGhlIGZsYXNoIHBsYXllciB0byBzY2FsZSB0aGUgY29udGVudAotICAgIC8vIGl0 IGlzIGRyYXdpbmcgdG8gbWF0Y2ggdGhlIHNjYWxlIG9mIHRoZSBwYWdlLgotICAgIGRvdWJsZSB6 b29tRmFjdG9ySCA9IHN0YXRpY19jYXN0PGRvdWJsZT4obV9wcml2YXRlLT5tX3BsdWdpbkJ1ZmZl clNpemUud2lkdGgoKSkgLyBzdGF0aWNfY2FzdDxkb3VibGU+KGZyYW1lUmVjdCgpLndpZHRoKCkp OwotICAgIGRvdWJsZSB6b29tRmFjdG9yVyA9IHN0YXRpY19jYXN0PGRvdWJsZT4obV9wcml2YXRl LT5tX3BsdWdpbkJ1ZmZlclNpemUuaGVpZ2h0KCkpIC8gc3RhdGljX2Nhc3Q8ZG91YmxlPihmcmFt ZVJlY3QoKS5oZWlnaHQoKSk7Ci0gICAgZG91YmxlIHpvb21GYWN0b3IgPSAoem9vbUZhY3Rvckgg KyB6b29tRmFjdG9yVykgLyAyLjA7Ci0KLSAgICAvLyBUaGlzIG1ldGhvZCBkcmF3cyBhIGhvbGUg aWYgc3BlY2lmaWVkLgotICAgIGlmICghbV9wcml2YXRlLT5tX2hvbGVQdW5jaFJlY3QuaXNFbXB0 eSgpCi0gICAgICAgICYmIGhvbGVQdW5jaFJlY3QuaW50ZXJzZWN0KHVuY2xpcHBlZEhvbGVQdW5j aFJlY3QsIHNrU3JjUmVjdCkpIHsKLQotICAgICAgICAvLyBEcmF3IHRoZSB0b3AgY2h1bmsgaWYg bmVlZGVkLgotICAgICAgICBpZiAoaG9sZVB1bmNoUmVjdC5mVG9wID4gc2tTcmNSZWN0LmZUb3Ap IHsKLSAgICAgICAgICAgIFNrSVJlY3Qgc3JjUmVjdDsKLSAgICAgICAgICAgIHNyY1JlY3Quc2V0 KHNrU3JjUmVjdC5mTGVmdCAqIHpvb21GYWN0b3IsIHNrU3JjUmVjdC5mVG9wICogem9vbUZhY3Rv ciwKLSAgICAgICAgICAgICAgICAgICAgICAgIHNrU3JjUmVjdC5mUmlnaHQgKiB6b29tRmFjdG9y LCBob2xlUHVuY2hSZWN0LmZUb3AgKiB6b29tRmFjdG9yKTsKLQotICAgICAgICAgICAgU2tSZWN0 IGRzdFJlY3Q7Ci0gICAgICAgICAgICBkc3RSZWN0LnNldChza1NyY1JlY3QuZkxlZnQsIHNrU3Jj UmVjdC5mVG9wLAotICAgICAgICAgICAgICAgICAgICAgICAgc2tTcmNSZWN0LmZSaWdodCwgaG9s ZVB1bmNoUmVjdC5mVG9wKTsKLSAgICAgICAgICAgIGRzdFJlY3Qub2Zmc2V0KGZyYW1lUmVjdCgp LngoKSwgZnJhbWVSZWN0KCkueSgpKTsKLQotICAgICAgICAgICAgY2FudmFzLT5kcmF3Qml0bWFw UmVjdChwbHVnaW5JbWFnZSwgJnNyY1JlY3QsIGRzdFJlY3QpOwotICAgICAgICB9Ci0KLSAgICAg ICAgLy8gRHJhdyB0aGUgbGVmdCBjaHVuayBpZiBuZWVkZWQuCi0gICAgICAgIGlmIChob2xlUHVu Y2hSZWN0LmZMZWZ0ID4gc2tTcmNSZWN0LmZMZWZ0KSB7Ci0gICAgICAgICAgICBTa0lSZWN0IHNy Y1JlY3Q7Ci0gICAgICAgICAgICBzcmNSZWN0LnNldChza1NyY1JlY3QuZkxlZnQgKiB6b29tRmFj dG9yLCBob2xlUHVuY2hSZWN0LmZUb3AgKiB6b29tRmFjdG9yLAotICAgICAgICAgICAgICAgICAg ICAgICAgaG9sZVB1bmNoUmVjdC5mTGVmdCAqIHpvb21GYWN0b3IsIGhvbGVQdW5jaFJlY3QuZkJv dHRvbSAqIHpvb21GYWN0b3IpOwotCi0gICAgICAgICAgICBTa1JlY3QgZHN0UmVjdDsKLSAgICAg ICAgICAgIGRzdFJlY3Quc2V0KHNrU3JjUmVjdC5mTGVmdCwgaG9sZVB1bmNoUmVjdC5mVG9wLAot ICAgICAgICAgICAgICAgICAgICAgICAgaG9sZVB1bmNoUmVjdC5mTGVmdCwgaG9sZVB1bmNoUmVj dC5mQm90dG9tKTsKLSAgICAgICAgICAgIGRzdFJlY3Qub2Zmc2V0KGZyYW1lUmVjdCgpLngoKSwg ZnJhbWVSZWN0KCkueSgpKTsKLQotICAgICAgICAgICAgY2FudmFzLT5kcmF3Qml0bWFwUmVjdChw bHVnaW5JbWFnZSwgJnNyY1JlY3QsIGRzdFJlY3QpOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8g RHJhdyB0aGUgaG9sZSBjaHVuay4KLSAgICAgICAgewotICAgICAgICAgICAgU2tQYWludCBwYWlu dDsKLSAgICAgICAgICAgIHBhaW50LnNldFhmZXJtb2RlTW9kZShTa1hmZXJtb2RlOjprU3JjX01v ZGUpOwotCi0gICAgICAgICAgICBTa0lSZWN0IHNyY1JlY3Q7Ci0gICAgICAgICAgICBzcmNSZWN0 LnNldChob2xlUHVuY2hSZWN0LmZMZWZ0ICogem9vbUZhY3RvciwgaG9sZVB1bmNoUmVjdC5mVG9w ICogem9vbUZhY3RvciwKLSAgICAgICAgICAgICAgICAgICAgICAgIGhvbGVQdW5jaFJlY3QuZlJp Z2h0ICogem9vbUZhY3RvciwgaG9sZVB1bmNoUmVjdC5mQm90dG9tICogem9vbUZhY3Rvcik7Ci0K LSAgICAgICAgICAgIFNrUmVjdCBkc3RSZWN0OwotICAgICAgICAgICAgZHN0UmVjdC5zZXQoaG9s ZVB1bmNoUmVjdC5mTGVmdCwgaG9sZVB1bmNoUmVjdC5mVG9wLAotICAgICAgICAgICAgICAgICAg ICAgICAgaG9sZVB1bmNoUmVjdC5mUmlnaHQsIGhvbGVQdW5jaFJlY3QuZkJvdHRvbSk7Ci0gICAg ICAgICAgICBkc3RSZWN0Lm9mZnNldChmcmFtZVJlY3QoKS54KCksIGZyYW1lUmVjdCgpLnkoKSk7 Ci0KLSAgICAgICAgICAgIGNhbnZhcy0+ZHJhd0JpdG1hcFJlY3QocGx1Z2luSW1hZ2UsICZzcmNS ZWN0LCBkc3RSZWN0LCAmcGFpbnQpOwotICAgICAgICB9Ci0KLSAgICAgICAgLy8gRHJhdyB0aGUg cmlnaHQgY2h1bmsgaWYgbmVlZGVkLgotICAgICAgICBpZiAoaG9sZVB1bmNoUmVjdC5mUmlnaHQg PCBza1NyY1JlY3QuZlJpZ2h0KSB7Ci0gICAgICAgICAgICBTa0lSZWN0IHNyY1JlY3Q7Ci0gICAg ICAgICAgICBzcmNSZWN0LnNldChob2xlUHVuY2hSZWN0LmZSaWdodCAqIHpvb21GYWN0b3IsIGhv bGVQdW5jaFJlY3QuZlRvcCAqIHpvb21GYWN0b3IsCi0gICAgICAgICAgICAgICAgICAgICAgICBz a1NyY1JlY3QuZlJpZ2h0ICogem9vbUZhY3RvciwgaG9sZVB1bmNoUmVjdC5mQm90dG9tICogem9v bUZhY3Rvcik7Ci0KLSAgICAgICAgICAgIFNrUmVjdCBkc3RSZWN0OwotICAgICAgICAgICAgZHN0 UmVjdC5zZXQoaG9sZVB1bmNoUmVjdC5mUmlnaHQsIGhvbGVQdW5jaFJlY3QuZlRvcCwgc2tTcmNS ZWN0LmZSaWdodCwgaG9sZVB1bmNoUmVjdC5mQm90dG9tKTsKLSAgICAgICAgICAgIGRzdFJlY3Qu b2Zmc2V0KGZyYW1lUmVjdCgpLngoKSwgZnJhbWVSZWN0KCkueSgpKTsKLQotICAgICAgICAgICAg Y2FudmFzLT5kcmF3Qml0bWFwUmVjdChwbHVnaW5JbWFnZSwgJnNyY1JlY3QsIGRzdFJlY3QpOwot ICAgICAgICB9Ci0KLSAgICAgICAgLy8gRHJhdyB0aGUgYm90dG9tIGNodW5rIGlmIG5lZWRlZC4K LSAgICAgICAgaWYgKGhvbGVQdW5jaFJlY3QuZkJvdHRvbSA8IHNrU3JjUmVjdC5mQm90dG9tKSB7 Ci0gICAgICAgICAgICBTa0lSZWN0IHNyY1JlY3Q7Ci0gICAgICAgICAgICBzcmNSZWN0LnNldChz a1NyY1JlY3QuZkxlZnQgKiB6b29tRmFjdG9yLCBob2xlUHVuY2hSZWN0LmZCb3R0b20gKiB6b29t RmFjdG9yLAotICAgICAgICAgICAgICAgICAgICAgICAgc2tTcmNSZWN0LmZSaWdodCAqIHpvb21G YWN0b3IsIHNrU3JjUmVjdC5mQm90dG9tICogem9vbUZhY3Rvcik7Ci0KLSAgICAgICAgICAgIFNr UmVjdCBkc3RSZWN0OwotICAgICAgICAgICAgZHN0UmVjdC5zZXQoc2tTcmNSZWN0LmZMZWZ0LCBo b2xlUHVuY2hSZWN0LmZCb3R0b20sCi0gICAgICAgICAgICAgICAgICAgICAgICBza1NyY1JlY3Qu ZlJpZ2h0LCBza1NyY1JlY3QuZkJvdHRvbSk7Ci0gICAgICAgICAgICBkc3RSZWN0Lm9mZnNldChm cmFtZVJlY3QoKS54KCksIGZyYW1lUmVjdCgpLnkoKSk7Ci0KLSAgICAgICAgICAgIGNhbnZhcy0+ ZHJhd0JpdG1hcFJlY3QocGx1Z2luSW1hZ2UsICZzcmNSZWN0LCBkc3RSZWN0KTsKLSAgICAgICAg fQotICAgIH0gZWxzZSB7Ci0gICAgICAgIFNrSVJlY3Qgc3JjUmVjdDsKLSAgICAgICAgc3JjUmVj dC5zZXQoc2tTcmNSZWN0LmZMZWZ0ICogem9vbUZhY3Rvciwgc2tTcmNSZWN0LmZUb3AgKiB6b29t RmFjdG9yLAotICAgICAgICAgICAgICAgICAgICBza1NyY1JlY3QuZlJpZ2h0ICogem9vbUZhY3Rv ciwgc2tTcmNSZWN0LmZCb3R0b20gKiB6b29tRmFjdG9yKTsKLQotICAgICAgICAvLyBDYWxjdWxh dGUgdGhlIGRlc3RpbmF0aW9uIHJlY3RhbmdsZS4KLSAgICAgICAgU2tSZWN0IGRzdFJlY3Q7Ci0g ICAgICAgIGRzdFJlY3Quc2V0KHJlY3RDbGlwLngoKSwgcmVjdENsaXAueSgpLAotICAgICAgICAg ICAgICAgICAgICByZWN0Q2xpcC54KCkgKyByZWN0Q2xpcC53aWR0aCgpLAotICAgICAgICAgICAg ICAgICAgICByZWN0Q2xpcC55KCkgKyByZWN0Q2xpcC5oZWlnaHQoKSk7Ci0KLSAgICAgICAgLy8g RG9uJ3QgcHVuY2ggYSBob2xlLgotICAgICAgICBjYW52YXMtPmRyYXdCaXRtYXBSZWN0KHBsdWdp bkltYWdlLCAmc3JjUmVjdCwgZHN0UmVjdCk7Ci0gICAgfQotCi0gICAgY29udGV4dC0+cmVzdG9y ZSgpOwotCi0gICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OkdyYXBoaWNzOjpyZWxlYXNlQnVmZmVy QmFja2luZ0ltYWdlKGZyb250QnVmZmVyKTsKIH0KIAogCg==