51634 2010-12-26 23:49:04 -0800 Clean up: Rename HTMLFrameElementBase::getMarginWidth() and HTMLFrameElementBase::getMarginHeight() 2010-12-27 16:21:36 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates hyatt oldest_to_newest 326990 0 dbates 2010-12-26 23:49:04 -0800 We should rename HTMLFrameElementBase::getMarginWidth() and HTMLFrameElementBase::getMarginHeight() to HTMLFrameElementBase::marginWidth() and HTMLFrameElementBase::marginHeight(), respectively, so as to conform to the naming convention we use for getters. 326991 1 77483 dbates 2010-12-26 23:51:12 -0800 Created attachment 77483 Patch 327146 2 77483 dbates 2010-12-27 16:21:31 -0800 Comment on attachment 77483 Patch Clearing flags on attachment: 77483 Committed r74700: <http://trac.webkit.org/changeset/74700> 327147 3 dbates 2010-12-27 16:21:36 -0800 All reviewed patches have been landed. Closing bug. 77483 2010-12-26 23:51:12 -0800 2010-12-27 16:21:31 -0800 Patch Bug51634.patch text/plain 7057 dbates SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDY3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMzEgQEAKKzIwMTAtMTItMjYgIERhbmllbCBCYXRlcyAgPGRiYXRlc0ByaW0uY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENsZWFu IHVwOiBSZW5hbWUgSFRNTEZyYW1lRWxlbWVudEJhc2U6OmdldE1hcmdpbldpZHRoKCkgYW5kIEhU TUxGcmFtZUVsZW1lbnRCYXNlOjpnZXRNYXJnaW5IZWlnaHQoKQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTE2MzQKKworICAgICAgICBSZW5hbWUgSFRN TEZyYW1lRWxlbWVudEJhc2U6OmdldE1hcmdpbldpZHRoKCkgYW5kIEhUTUxGcmFtZUVsZW1lbnRC YXNlOjpnZXRNYXJnaW5IZWlnaHQoKQorICAgICAgICB0byBIVE1MRnJhbWVFbGVtZW50QmFzZTo6 bWFyZ2luSGVpZ2h0KCkgYW5kIEhUTUxGcmFtZUVsZW1lbnRCYXNlOjptYXJnaW5IZWlnaHQoKSwg cmVzcGVjdGl2ZWx5LgorICAgICAgICBUaGlzIHdpbGwgbWFrZSB0aGUgbmFtZXMgb2YgdGhlc2Ug Z2V0dGVycyBjb25zaXN0ZW50IHdpdGggdGhlIG5hbWluZyBjb252ZW50aW9uIHdlIHVzZSBmb3IK KyAgICAgICAgZ2V0dGVycy4KKworICAgICAgICAqIGh0bWwvSFRNTEJvZHlFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxCb2R5RWxlbWVudDo6aW5zZXJ0ZWRJbnRvRG9jdW1lbnQp OgorICAgICAgICAqIGh0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuaDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjptYXJnaW5XaWR0aCk6IFJlbmFtZWQ7IEZvcm1lcmx5 IGdldE1hcmdpbldpZHRoKCkuCisgICAgICAgIChXZWJDb3JlOjpIVE1MRnJhbWVFbGVtZW50QmFz ZTo6bWFyZ2luSGVpZ2h0KTogUmVuYW1lZDsgRm9ybWVybHkgZ2V0TWFyZ2luSGVpZ2h0KCkuCisg ICAgICAgICogbG9hZGVyL1N1YmZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN1 YmZyYW1lTG9hZGVyOjpsb2FkU3ViZnJhbWUpOgorICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lVmlldzo6aW5pdCk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckVtYmVkZGVkT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckVt YmVkZGVkT2JqZWN0Ojp2aWV3Q2xlYXJlZCk6IEFsc28gcmVuYW1lZCB2YXJpYWJsZXMgbWFyZ2lu dyBhbmQgbWFyZ2luaAorICAgICAgICB0byBtYXJnaW5XaWR0aCBhbmQgbWFyZ2luSGVpZ2h0LCBy ZXNwZWN0aXZlbHkuIFRoaXMgbWFrZXMgdGhlIG5hbWVzIG9mIHRoZXNlIHZhcmlhYmxlcworICAg ICAgICBjb25zaXN0ZW50IHdpdGggdGhlIG5hbWVzIG9mIHNpbWlsYXIgdmFyaWFibGVzIGluIFN1 YmZyYW1lTG9hZGVyOjpsb2FkU3ViZnJhbWUoKSBhbmQgRnJhbWVWaWV3Ojppbml0KCkuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckZyYW1lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckZyYW1lOjp2aWV3Q2xlYXJlZCk6IERpdHRvLgorCiAyMDEwLTEyLTI2ICBNT1JJVEEgSGFqaW1l ICA8bW9ycml0YUBnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3Rl aW4uCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAkocmV2aXNpb24gNzQ2NzgpCisrKyBX ZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTg0LDEw ICsxODQsMTAgQEAgdm9pZCBIVE1MQm9keUVsZW1lbnQ6Omluc2VydGVkSW50b0RvY3VtZQogICAg IEVsZW1lbnQqIG93bmVyRWxlbWVudCA9IGRvY3VtZW50KCktPm93bmVyRWxlbWVudCgpOwogICAg IGlmIChvd25lckVsZW1lbnQgJiYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFtZShmcmFtZVRhZykg fHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpKSB7CiAgICAgICAgIEhUTUxG cmFtZUVsZW1lbnRCYXNlKiBvd25lckZyYW1lRWxlbWVudCA9IHN0YXRpY19jYXN0PEhUTUxGcmFt ZUVsZW1lbnRCYXNlKj4ob3duZXJFbGVtZW50KTsKLSAgICAgICAgaW50IG1hcmdpbldpZHRoID0g b3duZXJGcmFtZUVsZW1lbnQtPmdldE1hcmdpbldpZHRoKCk7CisgICAgICAgIGludCBtYXJnaW5X aWR0aCA9IG93bmVyRnJhbWVFbGVtZW50LT5tYXJnaW5XaWR0aCgpOwogICAgICAgICBpZiAobWFy Z2luV2lkdGggIT0gLTEpCiAgICAgICAgICAgICBzZXRBdHRyaWJ1dGUobWFyZ2lud2lkdGhBdHRy LCBTdHJpbmc6Om51bWJlcihtYXJnaW5XaWR0aCkpOwotICAgICAgICBpbnQgbWFyZ2luSGVpZ2h0 ID0gb3duZXJGcmFtZUVsZW1lbnQtPmdldE1hcmdpbkhlaWdodCgpOworICAgICAgICBpbnQgbWFy Z2luSGVpZ2h0ID0gb3duZXJGcmFtZUVsZW1lbnQtPm1hcmdpbkhlaWdodCgpOwogICAgICAgICBp ZiAobWFyZ2luSGVpZ2h0ICE9IC0xKQogICAgICAgICAgICAgc2V0QXR0cmlidXRlKG1hcmdpbmhl aWdodEF0dHIsIFN0cmluZzo6bnVtYmVyKG1hcmdpbkhlaWdodCkpOwogICAgIH0KSW5kZXg6IFdl YkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv aHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5oCShyZXZpc2lvbiA3NDY3OCkKKysrIFdlYkNvcmUv aHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNiw4ICszNiw4 IEBAIHB1YmxpYzoKIAogICAgIHZpcnR1YWwgU2Nyb2xsYmFyTW9kZSBzY3JvbGxpbmdNb2RlKCkg Y29uc3QgeyByZXR1cm4gbV9zY3JvbGxpbmc7IH0KICAgICAKLSAgICBpbnQgZ2V0TWFyZ2luV2lk dGgoKSBjb25zdCB7IHJldHVybiBtX21hcmdpbldpZHRoOyB9Ci0gICAgaW50IGdldE1hcmdpbkhl aWdodCgpIGNvbnN0IHsgcmV0dXJuIG1fbWFyZ2luSGVpZ2h0OyB9CisgICAgaW50IG1hcmdpbldp ZHRoKCkgY29uc3QgeyByZXR1cm4gbV9tYXJnaW5XaWR0aDsgfQorICAgIGludCBtYXJnaW5IZWln aHQoKSBjb25zdCB7IHJldHVybiBtX21hcmdpbkhlaWdodDsgfQogCiAgICAgaW50IHdpZHRoKCkg Y29uc3Q7CiAgICAgaW50IGhlaWdodCgpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9sb2FkZXIvU3Vi ZnJhbWVMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvbG9hZGVyL1N1YmZyYW1lTG9h ZGVyLmNwcAkocmV2aXNpb24gNzQ2NzgpCisrKyBXZWJDb3JlL2xvYWRlci9TdWJmcmFtZUxvYWRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1Myw4ICsyNTMsOCBAQCBGcmFtZSogU3ViZnJhbWVM b2FkZXI6OmxvYWRTdWJmcmFtZShIVE1MCiAgICAgaWYgKG93bmVyRWxlbWVudC0+aGFzVGFnTmFt ZShmcmFtZVRhZykgfHwgb3duZXJFbGVtZW50LT5oYXNUYWdOYW1lKGlmcmFtZVRhZykpIHsKICAg ICAgICAgSFRNTEZyYW1lRWxlbWVudEJhc2UqIG8gPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVFbGVt ZW50QmFzZSo+KG93bmVyRWxlbWVudCk7CiAgICAgICAgIGFsbG93c1Njcm9sbGluZyA9IG8tPnNj cm9sbGluZ01vZGUoKSAhPSBTY3JvbGxiYXJBbHdheXNPZmY7Ci0gICAgICAgIG1hcmdpbldpZHRo ID0gby0+Z2V0TWFyZ2luV2lkdGgoKTsKLSAgICAgICAgbWFyZ2luSGVpZ2h0ID0gby0+Z2V0TWFy Z2luSGVpZ2h0KCk7CisgICAgICAgIG1hcmdpbldpZHRoID0gby0+bWFyZ2luV2lkdGgoKTsKKyAg ICAgICAgbWFyZ2luSGVpZ2h0ID0gby0+bWFyZ2luSGVpZ2h0KCk7CiAgICAgfQogCiAgICAgaWYg KCFvd25lckVsZW1lbnQtPmRvY3VtZW50KCktPnNlY3VyaXR5T3JpZ2luKCktPmNhbkRpc3BsYXko dXJsKSkgewpJbmRleDogV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAJKHJldmlzaW9uIDc0Njc4KQorKysgV2ViQ29yZS9w YWdlL0ZyYW1lVmlldy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1Myw4ICsyNTMsOCBAQCB2b2lk IEZyYW1lVmlldzo6aW5pdCgpCiAgICAgICAgIEhUTUxGcmFtZUVsZW1lbnQqIGZyYW1lRWx0ID0g c3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxlbWVudCo+KG93bmVyRWxlbWVudCk7CiAgICAgICAgIGlm IChmcmFtZUVsdC0+c2Nyb2xsaW5nTW9kZSgpID09IFNjcm9sbGJhckFsd2F5c09mZikKICAgICAg ICAgICAgIHNldENhbkhhdmVTY3JvbGxiYXJzKGZhbHNlKTsKLSAgICAgICAgaW50IG1hcmdpbldp ZHRoID0gZnJhbWVFbHQtPmdldE1hcmdpbldpZHRoKCk7Ci0gICAgICAgIGludCBtYXJnaW5IZWln aHQgPSBmcmFtZUVsdC0+Z2V0TWFyZ2luSGVpZ2h0KCk7CisgICAgICAgIGludCBtYXJnaW5XaWR0 aCA9IGZyYW1lRWx0LT5tYXJnaW5XaWR0aCgpOworICAgICAgICBpbnQgbWFyZ2luSGVpZ2h0ID0g ZnJhbWVFbHQtPm1hcmdpbkhlaWdodCgpOwogICAgICAgICBpZiAobWFyZ2luV2lkdGggIT0gLTEp CiAgICAgICAgICAgICBzZXRNYXJnaW5XaWR0aChtYXJnaW5XaWR0aCk7CiAgICAgICAgIGlmICht YXJnaW5IZWlnaHQgIT0gLTEpCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbWJlZGRl ZE9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRW1iZWRk ZWRPYmplY3QuY3BwCShyZXZpc2lvbiA3NDY3OCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckVtYmVkZGVkT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM0LDE3ICsyMzQsMTcgQEAg dm9pZCBSZW5kZXJFbWJlZGRlZE9iamVjdDo6dmlld0NsZWFyZWQoKQogICAgIC8vIFRoaXMgaXMg cmVxdWlyZWQgZm9yIDxvYmplY3Q+IGVsZW1lbnRzIHdob3NlIGNvbnRlbnRzIGFyZSByZW5kZXJl ZCBieSBXZWJDb3JlIChlLmcuIHNyYz0iZm9vLmh0bWwiKS4KICAgICBpZiAobm9kZSgpICYmIHdp ZGdldCgpICYmIHdpZGdldCgpLT5pc0ZyYW1lVmlldygpKSB7CiAgICAgICAgIEZyYW1lVmlldyog dmlldyA9IHN0YXRpY19jYXN0PEZyYW1lVmlldyo+KHdpZGdldCgpKTsKLSAgICAgICAgaW50IG1h cmdpbncgPSAtMTsKLSAgICAgICAgaW50IG1hcmdpbmggPSAtMTsKKyAgICAgICAgaW50IG1hcmdp bldpZHRoID0gLTE7CisgICAgICAgIGludCBtYXJnaW5IZWlnaHQgPSAtMTsKICAgICAgICAgaWYg KG5vZGUoKS0+aGFzVGFnTmFtZShpZnJhbWVUYWcpKSB7CiAgICAgICAgICAgICBIVE1MSUZyYW1l RWxlbWVudCogZnJhbWUgPSBzdGF0aWNfY2FzdDxIVE1MSUZyYW1lRWxlbWVudCo+KG5vZGUoKSk7 Ci0gICAgICAgICAgICBtYXJnaW53ID0gZnJhbWUtPmdldE1hcmdpbldpZHRoKCk7Ci0gICAgICAg ICAgICBtYXJnaW5oID0gZnJhbWUtPmdldE1hcmdpbkhlaWdodCgpOworICAgICAgICAgICAgbWFy Z2luV2lkdGggPSBmcmFtZS0+bWFyZ2luV2lkdGgoKTsKKyAgICAgICAgICAgIG1hcmdpbkhlaWdo dCA9IGZyYW1lLT5tYXJnaW5IZWlnaHQoKTsKICAgICAgICAgfQotICAgICAgICBpZiAobWFyZ2lu dyAhPSAtMSkKLSAgICAgICAgICAgIHZpZXctPnNldE1hcmdpbldpZHRoKG1hcmdpbncpOwotICAg ICAgICBpZiAobWFyZ2luaCAhPSAtMSkKLSAgICAgICAgICAgIHZpZXctPnNldE1hcmdpbkhlaWdo dChtYXJnaW5oKTsKKyAgICAgICAgaWYgKG1hcmdpbldpZHRoICE9IC0xKQorICAgICAgICAgICAg dmlldy0+c2V0TWFyZ2luV2lkdGgobWFyZ2luV2lkdGgpOworICAgICAgICBpZiAobWFyZ2luSGVp Z2h0ICE9IC0xKQorICAgICAgICAgICAgdmlldy0+c2V0TWFyZ2luSGVpZ2h0KG1hcmdpbkhlaWdo dCk7CiAgICAgfQogfQogIApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRnJhbWUuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZyYW1lLmNwcAkocmV2aXNp b24gNzQ2NzgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGcmFtZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTUwLDEzICs1MCwxMyBAQCB2b2lkIFJlbmRlckZyYW1lOjp2aWV3Q2xlYXJlZCgp CiAKICAgICBGcmFtZVZpZXcqIHZpZXcgPSBzdGF0aWNfY2FzdDxGcmFtZVZpZXcqPih3aWRnZXQo KSk7CiAKLSAgICBpbnQgbWFyZ2ludyA9IGVsZW1lbnQtPmdldE1hcmdpbldpZHRoKCk7Ci0gICAg aW50IG1hcmdpbmggPSBlbGVtZW50LT5nZXRNYXJnaW5IZWlnaHQoKTsKKyAgICBpbnQgbWFyZ2lu V2lkdGggPSBlbGVtZW50LT5tYXJnaW5XaWR0aCgpOworICAgIGludCBtYXJnaW5IZWlnaHQgPSBl bGVtZW50LT5tYXJnaW5IZWlnaHQoKTsKIAotICAgIGlmIChtYXJnaW53ICE9IC0xKQotICAgICAg ICB2aWV3LT5zZXRNYXJnaW5XaWR0aChtYXJnaW53KTsKLSAgICBpZiAobWFyZ2luaCAhPSAtMSkK LSAgICAgICAgdmlldy0+c2V0TWFyZ2luSGVpZ2h0KG1hcmdpbmgpOworICAgIGlmIChtYXJnaW5X aWR0aCAhPSAtMSkKKyAgICAgICAgdmlldy0+c2V0TWFyZ2luV2lkdGgobWFyZ2luV2lkdGgpOwor ICAgIGlmIChtYXJnaW5IZWlnaHQgIT0gLTEpCisgICAgICAgIHZpZXctPnNldE1hcmdpbkhlaWdo dChtYXJnaW5IZWlnaHQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg==