122928 2013-10-16 16:58:41 -0700 Remove unnecessary check for RenderLayer and rename ensureLayer to createLayer in RenderLayerModelObject. 2013-10-17 12:13:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED BlinkMergeCandidate P2 Normal --- 1 vivekg vivekg commit-queue darin esprehn+autocc glenn kondapallykalyan simon.fraser oldest_to_newest 940587 0 vivekg 2013-10-16 16:58:41 -0700 RenderLayerModelObject::styleDidChange() invokes the ensureLayer() method only in case of !layer(). Again checking for layer existence would be deemed redundant in ensureLayer. Replacing it with an ASSERT(!m_layer). Blink Review URL: https://codereview.chromium.org/27246003/ 940592 1 214406 vivekg 2013-10-16 17:04:48 -0700 Created attachment 214406 Patch 940890 2 214406 commit-queue 2013-10-17 12:13:44 -0700 Comment on attachment 214406 Patch Clearing flags on attachment: 214406 Committed r157587: <http://trac.webkit.org/changeset/157587> 940891 3 commit-queue 2013-10-17 12:13:47 -0700 All reviewed patches have been landed. Closing bug. 214406 2013-10-16 17:04:48 -0700 2013-10-17 12:13:43 -0700 Patch bug-122928-20131017053445.patch text/plain 3073 vivekg U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3NTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjI1ZTZiYTJjZjhiMTkw NWU4ODc0NjczNDg2NDMwNmY2ZjMwYjUyOC4uY2Q2ZDE4ZjE3ZGIzM2FkODg5MzliODMxZDhiNzU5 YjBhZmU0YTlhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEzLTEwLTE2ICBWaXZl ayBHYWxhdGFnZSAgPHZpdmVrLnZnQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJlbW92ZSB1bm5l Y2Vzc2FyeSBjaGVjayBmb3IgUmVuZGVyTGF5ZXIgYW5kIHJlbmFtZSBlbnN1cmVMYXllciB0byBj cmVhdGVMYXllciBpbiBSZW5kZXJMYXllck1vZGVsT2JqZWN0LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyOTI4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGR1ZSB0byBjb2RlIHJl ZmFjdG9yaW5nLgorCisgICAgICAgIFJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN0eWxlRGlkQ2hh bmdlIGludm9rZXMgdGhlIGVuc3VyZUxheWVyKCkgb25seSBpbiBjYXNlIG9mICFsYXllcigpLgor ICAgICAgICBBZ2FpbiBjaGVja2luZyBmb3IgbGF5ZXIgZXhpc3RlbmNlIHdvdWxkIGJlIGRlZW1l ZCByZWR1bmRhbnQgaW4gZW5zdXJlTGF5ZXIuCisgICAgICAgIFJlcGxhY2luZyBpdCB3aXRoIGFu IEFTU0VSVCghbV9sYXllcikgYW5kIGFsc28gcmVuYW1pbmcgaXQgdG8gY3JlYXRlTGF5ZXIuCisK KyAgICAgICAgQmxpbmsgcmV2aWV3IFVSTDogaHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9y Zy8yNzI0NjAwMy8KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OmNyZWF0ZUxh eWVyKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyTW9kZWxPYmplY3Q6OnN0eWxlRGlk Q2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXJNb2RlbE9iamVjdC5oOgor CiAyMDEzLTEwLTE2ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAg ICAgICAgIFBsYXRmb3JtQ0FMYXllciBjb25zdHJ1Y3RvciBzaG91bGQgdGFrZSBsYXllciB0eXBl IGFzIGFuIGFyZ3VtZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJNb2RlbE9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TGF5ZXJNb2RlbE9iamVjdC5jcHAKaW5kZXggNzcyNDA5NDU4NGM1MGQxOWNkYmFkY2U3MjdmOGQ2 MzZmNmE4ZTU5ZS4uMzc5MGVkYzg0NmVlNDI0NWE5NjM5MWY4ZjI1YWQ1ZjVlY2I3Mjg1ZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3Qu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0 LmNwcApAQCAtNjEsMTEgKzYxLDkgQEAgdm9pZCBSZW5kZXJMYXllck1vZGVsT2JqZWN0OjpkZXN0 cm95TGF5ZXIoKQogICAgIG1fbGF5ZXIgPSBudWxscHRyOwogfQogCi12b2lkIFJlbmRlckxheWVy TW9kZWxPYmplY3Q6OmVuc3VyZUxheWVyKCkKK3ZvaWQgUmVuZGVyTGF5ZXJNb2RlbE9iamVjdDo6 Y3JlYXRlTGF5ZXIoKQogewotICAgIGlmIChtX2xheWVyKQotICAgICAgICByZXR1cm47Ci0KKyAg ICBBU1NFUlQoIW1fbGF5ZXIpOwogICAgIG1fbGF5ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFJlbmRl ckxheWVyPigqdGhpcyk7CiAgICAgc2V0SGFzTGF5ZXIodHJ1ZSk7CiAgICAgbV9sYXllci0+aW5z ZXJ0T25seVRoaXNMYXllcigpOwpAQCAtMTQ2LDcgKzE0NCw3IEBAIHZvaWQgUmVuZGVyTGF5ZXJN b2RlbE9iamVjdDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJl bmRlclN0CiAgICAgICAgIGlmICghbGF5ZXIoKSAmJiBsYXllckNyZWF0aW9uQWxsb3dlZEZvclN1 YnRyZWUoKSkgewogICAgICAgICAgICAgaWYgKHNfd2FzRmxvYXRpbmcgJiYgaXNGbG9hdGluZygp KQogICAgICAgICAgICAgICAgIHNldENoaWxkTmVlZHNMYXlvdXQoKTsKLSAgICAgICAgICAgIGVu c3VyZUxheWVyKCk7CisgICAgICAgICAgICBjcmVhdGVMYXllcigpOwogICAgICAgICAgICAgaWYg KHBhcmVudCgpICYmICFuZWVkc0xheW91dCgpICYmIGNvbnRhaW5pbmdCbG9jaygpKSB7CiAgICAg ICAgICAgICAgICAgbGF5ZXIoKS0+c2V0UmVwYWludFN0YXR1cyhOZWVkc0Z1bGxSZXBhaW50KTsK ICAgICAgICAgICAgICAgICAvLyBUaGVyZSBpcyBvbmx5IG9uZSBsYXllciB0byB1cGRhdGUsIGl0 IGlzIG5vdCB3b3J0aCB1c2luZyB8Y2FjaGVkT2Zmc2V0fCBzaW5jZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyTW9kZWxPYmplY3QuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllck1vZGVsT2JqZWN0LmgKaW5kZXggNWI3NzFkNWIy MjU5NmE2NjhjMGIxYTlhM2ZjNTkxMTNmMDJjZWE0Ni4uNWU0YjMzMzg4ZjI5MGVlMTU0NDU1MDFj ZGFiNDkzMjM2Y2IxOTlkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckxheWVyTW9kZWxPYmplY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJNb2RlbE9iamVjdC5oCkBAIC01Myw3ICs1Myw3IEBAIHByb3RlY3RlZDoKICAgICBS ZW5kZXJMYXllck1vZGVsT2JqZWN0KEVsZW1lbnQmLCB1bnNpZ25lZCBiYXNlVHlwZUZsYWdzKTsK ICAgICBSZW5kZXJMYXllck1vZGVsT2JqZWN0KERvY3VtZW50JiwgdW5zaWduZWQgYmFzZVR5cGVG bGFncyk7CiAKLSAgICB2b2lkIGVuc3VyZUxheWVyKCk7CisgICAgdm9pZCBjcmVhdGVMYXllcigp OwogCiAgICAgdmlydHVhbCB2b2lkIHdpbGxCZURlc3Ryb3llZCgpIE9WRVJSSURFOwogCg==