154035 2016-02-09 09:31:10 -0800 Fix the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) after r196281 2016-02-11 10:19:08 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=154104 P2 Normal --- 154003 1 ossy ossy cdumez commit-queue darin esprehn+autocc kangil.han koivisto ossy oldest_to_newest 1163208 0 ossy 2016-02-09 09:31:10 -0800 https://trac.webkit.org/r196281 broke the !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) build: In file included from ../../Source/WebCore/dom/ComposedTreeIterator.cpp:27:0: ../../Source/WebCore/dom/ComposedTreeIterator.h: In constructor 'WebCore::ComposedTreeIterator::Context::Context(WebCore::ContainerNode&, WebCore::Node&, size_t)': ../../Source/WebCore/dom/ComposedTreeIterator.h:74:15: error: class 'WebCore::ComposedTreeIterator::Context' does not have any field named 'slotNodeIndex' slotNodeIndex is declared inside ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) guard, but it is initialized unconditionally, which is incorrect and caused build failure. 1163209 1 270936 ossy 2016-02-09 09:34:48 -0800 Created attachment 270936 Patch 1163431 2 270936 commit-queue 2016-02-10 02:28:26 -0800 Comment on attachment 270936 Patch Clearing flags on attachment: 270936 Committed r196365: <http://trac.webkit.org/changeset/196365> 1163432 3 commit-queue 2016-02-10 02:28:30 -0800 All reviewed patches have been landed. Closing bug. 1163473 4 270936 darin 2016-02-10 09:06:14 -0800 Comment on attachment 270936 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=270936&action=review > Source/WebCore/dom/ComposedTreeIterator.h:81 > +#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) > , slotNodeIndex(slotNodeIndex) > { } > +#else > + { > + UNUSED_PARAM(slotNodeIndex); > + } > +#endif I should have caught you before landing this. I think we should have a style rule that #if should never introduce additional sets of braces unless it’s around an entire function. I also would have moved it outside the ComposedTreeIterator class definition because it starts to crud up the class definition and make it too hard to read. Thus I would have written this: Context(ContainerNode& root, Node&, size_t slotNodeIndex = notFound); ... inline ComposedTreeIterator::Context::Context(ContainerNode& root, Node& node, size_t slotNodeIndex) : iterator(root, &node) #if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT) , slotNodeIndex(slotNodeIndex) #endif { #if !(ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)) UNUSED_PARAM(slotNodeIndex); #endif } 1163494 5 ossy 2016-02-10 09:45:11 -0800 Reopening to attach new patch. 1163495 6 270997 ossy 2016-02-10 09:45:14 -0800 Created attachment 270997 Patch_option1 Style fix based on review comments. Not tested, let the EWS test ut. 1163497 7 commit-queue 2016-02-10 09:46:13 -0800 Attachment 270997 did not pass style-queue: ERROR: Source/WebCore/dom/ComposedTreeIterator.h:72: The parameter name "node" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1163638 8 koivisto 2016-02-10 15:22:06 -0800 I think a better fix is to just remove the #if around slotNodeIndex member. It doesn't really hurt to have it everywhere. 1163732 9 271056 ossy 2016-02-11 03:39:47 -0800 Created attachment 271056 Patch_option2 It's all the same for me, please decide which one do you prefer. 1163774 10 271056 commit-queue 2016-02-11 10:19:03 -0800 Comment on attachment 271056 Patch_option2 Clearing flags on attachment: 271056 Committed r196422: <http://trac.webkit.org/changeset/196422> 1163775 11 commit-queue 2016-02-11 10:19:08 -0800 All reviewed patches have been landed. Closing bug. 270936 2016-02-09 09:34:48 -0800 2016-02-10 02:28:26 -0800 Patch bug-154035-20160209183425.patch text/plain 1440 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzcyMjZiZmU2YTBlNzc1 MDFhYzRmODJlZGEzNmUxNzcwNTM3M2RmYy4uNDkzOGZlMGRiNjQ0MGUzMDZkYTM1MTI2ZDlkMDk3 YjM0ZjFmZTJkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE2LTAyLTA5ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IHRoZSAhKEVO QUJMRShTSEFET1dfRE9NKSB8fCBFTkFCTEUoREVUQUlMU19FTEVNRU5UKSkgYWZ0ZXIgcjE5NjI4 MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MDM1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBkb20v Q29tcG9zZWRUcmVlSXRlcmF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbXBvc2VkVHJlZUl0 ZXJhdG9yOjpDb250ZXh0OjpDb250ZXh0KToKKwogMjAxNi0wMi0wOSAgQ29tbWl0IFF1ZXVlICA8 Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBv dXQgcjE5NjI4Ni4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db21wb3NlZFRyZWVJ dGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbXBvc2VkVHJlZUl0ZXJhdG9yLmgKaW5k ZXggMzM0ZTc3YmQ2MmZiZTY5Y2IxYWVmYjU5NjFlY2EyZjYzY2Q2NTEyNy4uZmFhNGUzNWRmMzEw ZTU1ZThjZmQzMGQwM2JiYjQ4ZWQwZmY1MjY4MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0NvbXBvc2VkVHJlZUl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbXBv c2VkVHJlZUl0ZXJhdG9yLmgKQEAgLTcxLDggKzcxLDE0IEBAIHByaXZhdGU6CiAgICAgICAgIHsg fQogICAgICAgICBDb250ZXh0KENvbnRhaW5lck5vZGUmIHJvb3QsIE5vZGUmIG5vZGUsIHNpemVf dCBzbG90Tm9kZUluZGV4ID0gbm90Rm91bmQpCiAgICAgICAgICAgICA6IGl0ZXJhdG9yKHJvb3Qs ICZub2RlKQorI2lmIEVOQUJMRShTSEFET1dfRE9NKSB8fCBFTkFCTEUoREVUQUlMU19FTEVNRU5U KQogICAgICAgICAgICAgLCBzbG90Tm9kZUluZGV4KHNsb3ROb2RlSW5kZXgpCiAgICAgICAgIHsg fQorI2Vsc2UKKyAgICAgICAgeworICAgICAgICAgICAgVU5VU0VEX1BBUkFNKHNsb3ROb2RlSW5k ZXgpOworICAgICAgICB9CisjZW5kaWYKIAogICAgICAgICBFbGVtZW50QW5kVGV4dERlc2NlbmRh bnRJdGVyYXRvciBpdGVyYXRvcjsKICNpZiBFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKERF VEFJTFNfRUxFTUVOVCkK 270997 2016-02-10 09:45:14 -0800 2016-02-11 09:30:17 -0800 Patch_option1 bug-154035-20160210094452.patch text/plain 2333 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2MzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2UyMmNhNTdhZWFjZjll NTFjNTU0ZmVjMTE3MDE5NDMyZGFhZWE3Mi4uNDc4Njk2Yjk0ZmUwZmUwZDJjMzQ2YWFiMDNhOWU0 ZWJjMDdiNTg3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMyw2ICszLDE4IEBACiAgICAgICAgIEZpeCB0aGUg IShFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKERFVEFJTFNfRUxFTUVOVCkpIGFmdGVyIHIx OTYyODEKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NDAzNQogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0 eWxlIGZpeCBhZnRlciByMTk2MzY1LgorCisgICAgICAgICogZG9tL0NvbXBvc2VkVHJlZUl0ZXJh dG9yLmg6CisgICAgICAgIChXZWJDb3JlOjpDb21wb3NlZFRyZWVJdGVyYXRvcjo6Q29udGV4dDo6 Q29udGV4dCk6CisKKzIwMTYtMDItMTAgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0 Lm9yZz4KKworICAgICAgICBGaXggdGhlICEoRU5BQkxFKFNIQURPV19ET00pIHx8IEVOQUJMRShE RVRBSUxTX0VMRU1FTlQpKSBhZnRlciByMTk2MjgxCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTQwMzUKKwogICAgICAgICBSZXZpZXdlZCBieSBBbnR0 aSBLb2l2aXN0by4KIAogICAgICAgICAqIGRvbS9Db21wb3NlZFRyZWVJdGVyYXRvci5oOgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbXBvc2VkVHJlZUl0ZXJhdG9yLmggYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vQ29tcG9zZWRUcmVlSXRlcmF0b3IuaAppbmRleCBmYWE0ZTM1ZGYzMTBl NTVlOGNmZDMwZDAzYmJiNDhlZDBmZjUyNjgzLi5hNWQ2ZWEwMzhiOTQzYjczM2ZhZWZlYjQ1NWYw NzQxZDc5YzkxNWI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29tcG9zZWRUcmVl SXRlcmF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29tcG9zZWRUcmVlSXRlcmF0b3Iu aApAQCAtNjksMTcgKzY5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgZXhwbGljaXQgQ29udGV4dChD b250YWluZXJOb2RlJiByb290KQogICAgICAgICAgICAgOiBpdGVyYXRvcihyb290KQogICAgICAg ICB7IH0KLSAgICAgICAgQ29udGV4dChDb250YWluZXJOb2RlJiByb290LCBOb2RlJiBub2RlLCBz aXplX3Qgc2xvdE5vZGVJbmRleCA9IG5vdEZvdW5kKQotICAgICAgICAgICAgOiBpdGVyYXRvcihy b290LCAmbm9kZSkKLSNpZiBFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKERFVEFJTFNfRUxF TUVOVCkKLSAgICAgICAgICAgICwgc2xvdE5vZGVJbmRleChzbG90Tm9kZUluZGV4KQotICAgICAg ICB7IH0KLSNlbHNlCi0gICAgICAgIHsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShzbG90Tm9k ZUluZGV4KTsKLSAgICAgICAgfQotI2VuZGlmCi0KKyAgICAgICAgQ29udGV4dChDb250YWluZXJO b2RlJiByb290LCBOb2RlJiBub2RlLCBzaXplX3Qgc2xvdE5vZGVJbmRleCA9IG5vdEZvdW5kKTsK ICAgICAgICAgRWxlbWVudEFuZFRleHREZXNjZW5kYW50SXRlcmF0b3IgaXRlcmF0b3I7CiAjaWYg RU5BQkxFKFNIQURPV19ET00pIHx8IEVOQUJMRShERVRBSUxTX0VMRU1FTlQpCiAgICAgICAgIHNp emVfdCBzbG90Tm9kZUluZGV4IHsgbm90Rm91bmQgfTsKQEAgLTE1NSw2ICsxNDUsMTcgQEAgaW5s aW5lIHVuc2lnbmVkIENvbXBvc2VkVHJlZUl0ZXJhdG9yOjpkZXB0aCgpIGNvbnN0CiAgICAgcmV0 dXJuIGRlcHRoOwogfQogCitpbmxpbmUgQ29tcG9zZWRUcmVlSXRlcmF0b3I6OkNvbnRleHQ6OkNv bnRleHQoQ29udGFpbmVyTm9kZSYgcm9vdCwgTm9kZSYgbm9kZSwgc2l6ZV90IHNsb3ROb2RlSW5k ZXgpCisgICAgOiBpdGVyYXRvcihyb290LCAmbm9kZSkKKyNpZiBFTkFCTEUoU0hBRE9XX0RPTSkg fHwgRU5BQkxFKERFVEFJTFNfRUxFTUVOVCkKKyAgICAsIHNsb3ROb2RlSW5kZXgoc2xvdE5vZGVJ bmRleCkKKyNlbmRpZgoreworI2lmICEoRU5BQkxFKFNIQURPV19ET00pIHx8IEVOQUJMRShERVRB SUxTX0VMRU1FTlQpKQorICAgIFVOVVNFRF9QQVJBTShzbG90Tm9kZUluZGV4KTsKKyNlbmRpZgor fQorCiBjbGFzcyBDb21wb3NlZFRyZWVEZXNjZW5kYW50QWRhcHRlciB7CiBwdWJsaWM6CiAgICAg Q29tcG9zZWRUcmVlRGVzY2VuZGFudEFkYXB0ZXIoQ29udGFpbmVyTm9kZSYgcGFyZW50KQo= 271056 2016-02-11 03:39:47 -0800 2016-02-11 10:19:03 -0800 Patch_option2 bug-154035-20160211123924.patch text/plain 1752 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTk2NDE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg4ZWExZDM1ZGJjMWJl ZTlhYzVmZmZlYzQ3MzI3OTgyOWJjNWRkNC4uODQ1MWU3ZjdiZDhkYjVmNWU0ZjYyNTcwZjgzZjcx YzdmNmEwMDg1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE2LTAyLTExICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgRml4IHRoZSAhKEVO QUJMRShTSEFET1dfRE9NKSB8fCBFTkFCTEUoREVUQUlMU19FTEVNRU5UKSkgYWZ0ZXIgcjE5NjI4 MQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MDM1 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9sbG93 LXVwIGZpeCBhZnRlciByMTk2MzY1LiBSZW1vdmVkIGd1YXJkcyBhcm91bmQgc2xvdE5vZGVJbmRl eC4KKworICAgICAgICAqIGRvbS9Db21wb3NlZFRyZWVJdGVyYXRvci5oOgorICAgICAgICAoV2Vi Q29yZTo6Q29tcG9zZWRUcmVlSXRlcmF0b3I6OkNvbnRleHQ6OkNvbnRleHQpOgorCiAyMDE2LTAy LTEwICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFVwZGF0 aW5nIGJpbmRpbmdzIHRlc3QgcmVmZXJlbmNlIGZpbGUgZm9yIEpTVGVzdEV2ZW50Q29uc3RydWN0 b3IuY3BwIGFmdGVyIHIxOTY0MDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db21w b3NlZFRyZWVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbXBvc2VkVHJlZUl0ZXJh dG9yLmgKaW5kZXggZmFhNGUzNWRmMzEwZTU1ZThjZmQzMGQwM2JiYjQ4ZWQwZmY1MjY4My4uZWJm NDU1NTRjNjAyNTdmZjdlZTM3MmQzZTYwNDE2ZTk3YjI3MmZjYyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0NvbXBvc2VkVHJlZUl0ZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUv ZG9tL0NvbXBvc2VkVHJlZUl0ZXJhdG9yLmgKQEAgLTcxLDE5ICs3MSwxMSBAQCBwcml2YXRlOgog ICAgICAgICB7IH0KICAgICAgICAgQ29udGV4dChDb250YWluZXJOb2RlJiByb290LCBOb2RlJiBu b2RlLCBzaXplX3Qgc2xvdE5vZGVJbmRleCA9IG5vdEZvdW5kKQogICAgICAgICAgICAgOiBpdGVy YXRvcihyb290LCAmbm9kZSkKLSNpZiBFTkFCTEUoU0hBRE9XX0RPTSkgfHwgRU5BQkxFKERFVEFJ TFNfRUxFTUVOVCkKICAgICAgICAgICAgICwgc2xvdE5vZGVJbmRleChzbG90Tm9kZUluZGV4KQog ICAgICAgICB7IH0KLSNlbHNlCi0gICAgICAgIHsKLSAgICAgICAgICAgIFVOVVNFRF9QQVJBTShz bG90Tm9kZUluZGV4KTsKLSAgICAgICAgfQotI2VuZGlmCiAKICAgICAgICAgRWxlbWVudEFuZFRl eHREZXNjZW5kYW50SXRlcmF0b3IgaXRlcmF0b3I7Ci0jaWYgRU5BQkxFKFNIQURPV19ET00pIHx8 IEVOQUJMRShERVRBSUxTX0VMRU1FTlQpCiAgICAgICAgIHNpemVfdCBzbG90Tm9kZUluZGV4IHsg bm90Rm91bmQgfTsKLSNlbmRpZgogICAgIH07CiAgICAgQ29udGV4dCYgY29udGV4dCgpIHsgcmV0 dXJuIG1fY29udGV4dFN0YWNrLmxhc3QoKTsgfQogICAgIGNvbnN0IENvbnRleHQmIGNvbnRleHQo KSBjb25zdCB7IHJldHVybiBtX2NvbnRleHRTdGFjay5sYXN0KCk7IH0K