112143 2013-03-12 06:38:56 -0700 [BlackBerry] GraphicsLayer: fix code that was accidentally reverted 2013-03-21 12:38:39 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 111729 0 berto webkit-unassigned cgarcia mifenton rwlbuis tonikitoo webkit.review.bot xan.lopez oldest_to_newest 853407 0 berto 2013-03-12 06:38:56 -0700 Several changes were accidentally reverted in r144465 due to the upstreaming of some new code: - clearBackgroundColor() and m_contentsLayerHasBackgroundColor had been removed in r137798. - showDebugBorders() had been renamed to isShowingDebugBorder() in r133517. - A new GraphicsLayer::create() overload had been introduced in r130185. 853408 1 192724 berto 2013-03-12 06:40:34 -0700 Created attachment 192724 Patch 853496 2 192724 rwlbuis 2013-03-12 08:26:38 -0700 Comment on attachment 192724 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192724&action=review > Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:-810 > - return; Do we need this kind of check for m_layer? Or is it guarenteed to be non-null? 854099 3 berto 2013-03-13 00:38:50 -0700 (In reply to comment #2) > (From update of attachment 192724 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=192724&action=review > > > Source/WebCore/platform/graphics/blackberry/GraphicsLayerBlackBerry.cpp:-810 > > - return; > > Do we need this kind of check for m_layer? Or is it guarenteed to be non-null? m_layer is initialized in the constructor so it's guaranteed to always have a value. There's actually a check in GraphicsLayerBlackBerry::willBeDestroyed() that we should be able to remove: if (m_layer) m_layer->setOwner(0); 860567 4 192724 rwlbuis 2013-03-21 12:28:09 -0700 Comment on attachment 192724 Patch LGTM. 860579 5 192724 webkit.review.bot 2013-03-21 12:38:36 -0700 Comment on attachment 192724 Patch Clearing flags on attachment: 192724 Committed r146499: <http://trac.webkit.org/changeset/146499> 860580 6 webkit.review.bot 2013-03-21 12:38:39 -0700 All reviewed patches have been landed. Closing bug. 192724 2013-03-12 06:40:34 -0700 2013-03-21 12:38:35 -0700 Patch 112143.diff text/plain 5330 berto ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmN2I5YjFkLi5kNTUyYzgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQg QEAKKzIwMTMtMDMtMTIgIEFsYmVydG8gR2FyY2lhICA8YWdhcmNpYUBpZ2FsaWEuY29tPgorCisg ICAgICAgIFtCbGFja0JlcnJ5XSBHcmFwaGljc0xheWVyOiBmaXggY29kZSB0aGF0IHdhcyBhY2Np ZGVudGFsbHkgcmV2ZXJ0ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMjE0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFNldmVyYWwgY2hhbmdlcyB3ZXJlIGFjY2lkZW50YWxseSByZXZlcnRlZCBpbiBy MTQ0NDY1IGR1ZSB0byB0aGUKKyAgICAgICAgdXBzdHJlYW1pbmcgb2Ygc29tZSBuZXcgY29kZToK KworICAgICAgICAtIGNsZWFyQmFja2dyb3VuZENvbG9yKCkgYW5kIG1fY29udGVudHNMYXllckhh c0JhY2tncm91bmRDb2xvciBoYWQKKyAgICAgICAgICBiZWVuIHJlbW92ZWQgaW4gcjEzNzc5OC4K KworICAgICAgICAtIHNob3dEZWJ1Z0JvcmRlcnMoKSBoYWQgYmVlbiByZW5hbWVkIHRvIGlzU2hv d2luZ0RlYnVnQm9yZGVyKCkgaW4KKyAgICAgICAgICByMTMzNTE3LgorCisgICAgICAgIC0gQSBu ZXcgR3JhcGhpY3NMYXllcjo6Y3JlYXRlKCkgb3ZlcmxvYWQgaGFkIGJlZW4gaW50cm9kdWNlZCBp bgorICAgICAgICAgIHIxMzAxODUuCisKKyAgICAgICAgVGhpcyBwYXRjaCBmaXhlcyB0aGVtIGFs bC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhpY3NMYXll ckJsYWNrQmVycnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllcjo6Y3JlYXRl KToKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckJs YWNrQmVycnk6OkdyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5KToKKyAgICAgICAgKFdlYkNvcmU6Okdy YXBoaWNzTGF5ZXJCbGFja0JlcnJ5OjpzZXRCYWNrZ3JvdW5kQ29sb3IpOgorICAgICAgICAoV2Vi Q29yZTo6R3JhcGhpY3NMYXllckJsYWNrQmVycnk6OnVwZGF0ZUxheWVyQmFja2dyb3VuZENvbG9y KToKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5OjpzZXR1cENvbnRl bnRzTGF5ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhp Y3NMYXllckJsYWNrQmVycnkuaDoKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5KToK KwogMjAxMy0wMy0xMiAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZXNvdXJjZVNjcmlwdEZpbGUgZGl2ZXJnZWQgc3RhdGUg c2hvdWxkIGJlIGNvcnJlY3RseSByZXNldCBhZnRlciBkZWJ1Z2dlciByZXNldC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhpY3NM YXllckJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9HcmFwaGljc0xheWVyQmxhY2tCZXJyeS5jcHAKaW5kZXggYjVmNGNjMi4uZTBlZmQz N2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvR3JhcGhpY3NMYXllckJsYWNrQmVycnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvR3JhcGhpY3NMYXllckJsYWNrQmVycnkuY3BwCkBAIC00 OCw2ICs0OCw3IEBACiAKICNpbmNsdWRlICJGbG9hdENvbnZlcnNpb24uaCIKICNpbmNsdWRlICJG bG9hdFJlY3QuaCIKKyNpbmNsdWRlICJHcmFwaGljc0xheWVyRmFjdG9yeS5oIgogI2luY2x1ZGUg IkltYWdlLmgiCiAjaW5jbHVkZSAiTGF5ZXJBbmltYXRpb24uaCIKICNpbmNsdWRlICJMYXllcldl YktpdFRocmVhZC5oIgpAQCAtNzksNiArODAsMTQgQEAgc3RhdGljIHZvaWQgY2xlYXJMYXllckJh Y2tncm91bmRDb2xvcihMYXllcldlYktpdFRocmVhZCYgbGF5ZXIpCiAgICAgbGF5ZXIuc2V0QmFj a2dyb3VuZENvbG9yKENvbG9yOjp0cmFuc3BhcmVudCk7CiB9CiAKK1Bhc3NPd25QdHI8R3JhcGhp Y3NMYXllcj4gR3JhcGhpY3NMYXllcjo6Y3JlYXRlKEdyYXBoaWNzTGF5ZXJGYWN0b3J5KiBmYWN0 b3J5LCBHcmFwaGljc0xheWVyQ2xpZW50KiBjbGllbnQpCit7CisgICAgaWYgKCFmYWN0b3J5KQor ICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEdyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5KGNsaWVu dCkpOworCisgICAgcmV0dXJuIGZhY3RvcnktPmNyZWF0ZUdyYXBoaWNzTGF5ZXIoY2xpZW50KTsK K30KKwogUGFzc093blB0cjxHcmFwaGljc0xheWVyPiBHcmFwaGljc0xheWVyOjpjcmVhdGUoR3Jh cGhpY3NMYXllckNsaWVudCogY2xpZW50KQogewogICAgIHJldHVybiBhZG9wdFB0cihuZXcgR3Jh cGhpY3NMYXllckJsYWNrQmVycnkoY2xpZW50KSk7CkBAIC04OCw3ICs5Nyw2IEBAIEdyYXBoaWNz TGF5ZXJCbGFja0JlcnJ5OjpHcmFwaGljc0xheWVyQmxhY2tCZXJyeShHcmFwaGljc0xheWVyQ2xp ZW50KiBjbGllbnQpCiAgICAgOiBHcmFwaGljc0xheWVyKGNsaWVudCkKICAgICAsIG1fc3VzcGVu ZFRpbWUoMCkKICAgICAsIG1fY29udGVudHNMYXllclB1cnBvc2UoTm9Db250ZW50c0xheWVyKQot ICAgICwgbV9jb250ZW50c0xheWVySGFzQmFja2dyb3VuZENvbG9yKGZhbHNlKQogewogICAgIG1f bGF5ZXIgPSBMYXllcldlYktpdFRocmVhZDo6Y3JlYXRlKExheWVyRGF0YTo6TGF5ZXIsIHRoaXMp OwogCkBAIC0zMTIsMjQgKzMyMCwxNCBAQCBib29sIEdyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5Ojpz ZXRGaWx0ZXJzKGNvbnN0IEZpbHRlck9wZXJhdGlvbnMmIGZpbHRlcnMpCiAKIHZvaWQgR3JhcGhp Y3NMYXllckJsYWNrQmVycnk6OnNldEJhY2tncm91bmRDb2xvcihjb25zdCBDb2xvciYgY29sb3Ip CiB7Ci0gICAgaWYgKG1fYmFja2dyb3VuZENvbG9yU2V0ICYmIG1fYmFja2dyb3VuZENvbG9yID09 IGNvbG9yKQorICAgIGlmIChjb2xvciA9PSBtX2JhY2tncm91bmRDb2xvcikKICAgICAgICAgcmV0 dXJuOwogCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0QmFja2dyb3VuZENvbG9yKGNvbG9yKTsKIAot ICAgIG1fY29udGVudHNMYXllckhhc0JhY2tncm91bmRDb2xvciA9IHRydWU7CiAgICAgdXBkYXRl TGF5ZXJCYWNrZ3JvdW5kQ29sb3IoKTsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQmxhY2tCZXJy eTo6Y2xlYXJCYWNrZ3JvdW5kQ29sb3IoKQotewotICAgIGlmICghbV9iYWNrZ3JvdW5kQ29sb3JT ZXQpCi0gICAgICAgIHJldHVybjsKLQotICAgIEdyYXBoaWNzTGF5ZXI6OmNsZWFyQmFja2dyb3Vu ZENvbG9yKCk7Ci0gICAgY2xlYXJMYXllckJhY2tncm91bmRDb2xvcigqbV9jb250ZW50c0xheWVy KTsKLX0KLQogdm9pZCBHcmFwaGljc0xheWVyQmxhY2tCZXJyeTo6c2V0Q29udGVudHNPcGFxdWUo Ym9vbCBvcGFxdWUpCiB7CiAgICAgaWYgKG1fY29udGVudHNPcGFxdWUgPT0gb3BhcXVlKQpAQCAt ODA2LDE0ICs4MDQsMTAgQEAgdm9pZCBHcmFwaGljc0xheWVyQmxhY2tCZXJyeTo6dXBkYXRlSGFz Rml4ZWRBbmNlc3RvckluRE9NVHJlZSgpCiAKIHZvaWQgR3JhcGhpY3NMYXllckJsYWNrQmVycnk6 OnVwZGF0ZUxheWVyQmFja2dyb3VuZENvbG9yKCkKIHsKLSAgICBpZiAoIW1fY29udGVudHNMYXll cikKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gV2UgbmV2ZXIgY3JlYXRlIHRoZSBjb250ZW50 cyBsYXllciBqdXN0IGZvciBiYWNrZ3JvdW5kIGNvbG9yIHlldC4KLSAgICBpZiAobV9iYWNrZ3Jv dW5kQ29sb3JTZXQpCi0gICAgICAgIHNldExheWVyQmFja2dyb3VuZENvbG9yKCptX2NvbnRlbnRz TGF5ZXIsIG1fYmFja2dyb3VuZENvbG9yKTsKKyAgICBpZiAobV9iYWNrZ3JvdW5kQ29sb3IuaXNW YWxpZCgpKQorICAgICAgICBzZXRMYXllckJhY2tncm91bmRDb2xvcigqbV9sYXllciwgbV9iYWNr Z3JvdW5kQ29sb3IpOwogICAgIGVsc2UKLSAgICAgICAgY2xlYXJMYXllckJhY2tncm91bmRDb2xv cigqbV9jb250ZW50c0xheWVyKTsKKyAgICAgICAgY2xlYXJMYXllckJhY2tncm91bmRDb2xvcigq bV9sYXllcik7CiB9CiAKICNpZiBFTkFCTEUoQ1NTX0ZJTFRFUlMpCkBAIC04ODgsNyArODgyLDcg QEAgdm9pZCBHcmFwaGljc0xheWVyQmxhY2tCZXJyeTo6c2V0dXBDb250ZW50c0xheWVyKExheWVy V2ViS2l0VGhyZWFkKiBjb250ZW50c0xheWUKIAogICAgICAgICB1cGRhdGVDb250ZW50c1JlY3Qo KTsKIAotICAgICAgICBpZiAoc2hvd0RlYnVnQm9yZGVycygpKSB7CisgICAgICAgIGlmIChpc1No b3dpbmdEZWJ1Z0JvcmRlcigpKSB7CiAgICAgICAgICAgICBzZXRMYXllckJvcmRlckNvbG9yKCpt X2NvbnRlbnRzTGF5ZXIsIENvbG9yKDAsIDAsIDEyOCwgMTgwKSk7CiAgICAgICAgICAgICBtX2Nv bnRlbnRzTGF5ZXItPnNldEJvcmRlcldpZHRoKDEpOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0dyYXBoaWNzTGF5ZXJC bGFja0JlcnJ5LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5 L0dyYXBoaWNzTGF5ZXJCbGFja0JlcnJ5LmgKaW5kZXggNmQ0YWZiMS4uNzZlYmU4MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJyeS9HcmFwaGlj c0xheWVyQmxhY2tCZXJyeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2JsYWNrYmVycnkvR3JhcGhpY3NMYXllckJsYWNrQmVycnkuaApAQCAtODMsNyArODMsNiBAQCBw dWJsaWM6CiAjZW5kaWYKIAogICAgIHZpcnR1YWwgdm9pZCBzZXRCYWNrZ3JvdW5kQ29sb3IoY29u c3QgQ29sb3ImKTsKLSAgICB2aXJ0dWFsIHZvaWQgY2xlYXJCYWNrZ3JvdW5kQ29sb3IoKTsKIAog ICAgIHZpcnR1YWwgdm9pZCBzZXRDb250ZW50c09wYXF1ZShib29sKTsKICAgICB2aXJ0dWFsIHZv aWQgc2V0QmFja2ZhY2VWaXNpYmlsaXR5KGJvb2wpOwpAQCAtMTgwLDcgKzE3OSw2IEBAIHByaXZh dGU6CiAgICAgfTsKIAogICAgIENvbnRlbnRzTGF5ZXJQdXJwb3NlIG1fY29udGVudHNMYXllclB1 cnBvc2U7Ci0gICAgYm9vbCBtX2NvbnRlbnRzTGF5ZXJIYXNCYWNrZ3JvdW5kQ29sb3IgOiAxOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=