26203 2009-06-04 20:07:39 -0700 Move parsing of 'attr(X)' values to own method 2009-06-04 20:30:13 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC All RESOLVED FIXED P5 Enhancement --- 0 rolandsteiner webkit-unassigned oldest_to_newest 124435 0 rolandsteiner 2009-06-04 20:07:39 -0700 [separated out from bug #26198] CSSParser.cpp/.h - move parsing of 'attr(X)' to own method move parsing of 'attr(X)' to its own method, in order to make re-using it easier. (E.g., CSS3 'ruby-span' would also use 'attr(X)') 124439 1 30984 rolandsteiner 2009-06-04 20:10:49 -0700 Created attachment 30984 patch - add new method for parsing of 'attr(X)' values 124453 2 30984 eric 2009-06-04 20:26:07 -0700 Comment on attachment 30984 patch - add new method for parsing of 'attr(X)' values Great! 124456 3 eric 2009-06-04 20:30:13 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/css/CSSParser.cpp M WebCore/css/CSSParser.h Committed r44448 30984 2009-06-04 20:10:49 -0700 2009-06-04 20:26:07 -0700 patch - add new method for parsing of 'attr(X)' values css-CSSParser-cpp-h.patch text/plain 3460 rolandsteiner SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDQ0MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDYtMDQgIFJvbGFuZCBTdGVpbmVyIDxyb2xhbmRzdGVpbmVy QGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkKKworICAg ICAgICBCdWcgMjYyMDM6IE1vdmUgcGFyc2luZyBvZiAnYXR0cihYKScgdmFsdWVzIHRvIG93biBt ZXRob2QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI2 MjAzCisKKyAgICAgICAgKiBjc3MvQ1NTUGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNT U1BhcnNlcjo6cGFyc2VBdHRyKTogbmV3IG1ldGhvZAorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFy c2VyOjpwYXJzZUNvbnRlbnQpOiB1c2UgbmV3IHBhcnNlQXR0ciBtZXRob2QKKyAgICAgICAgKiBj c3MvQ1NTUGFyc2VyLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQXR0cik6 IG5ldyBtZXRob2QKKwogMjAwOS0wNi0wNCAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29t PgogCiAgICAgICAgIC0gcmV0cnkgdG8gZml4IHRoZSBUaWdlciBidWlsZApJbmRleDogV2ViQ29y ZS9jc3MvQ1NTUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIu Y3BwCShyZXZpc2lvbiA0NDQxOSkKKysrIFdlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIwMDcsMjAgKzIwNTMsOSBAQAogICAgICAgICAgICAgaWYgKCFhcmdzKQog ICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIGlmIChlcXVhbElnbm9y aW5nQ2FzZSh2YWwtPmZ1bmN0aW9uLT5uYW1lLCAiYXR0cigiKSkgewotICAgICAgICAgICAgICAg IGlmIChhcmdzLT5zaXplKCkgIT0gMSkKKyAgICAgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IHBh cnNlQXR0cihhcmdzKTsKKyAgICAgICAgICAgICAgICBpZiAoIXBhcnNlZFZhbHVlKQogICAgICAg ICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICAgICAgQ1NTUGFyc2VyVmFs dWUqIGEgPSBhcmdzLT5jdXJyZW50KCk7Ci0gICAgICAgICAgICAgICAgaWYgKGEtPnVuaXQgIT0g Q1NTUHJpbWl0aXZlVmFsdWU6OkNTU19JREVOVCkKLSAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwotICAgICAgICAgICAgICAgIFN0cmluZyBhdHRyTmFtZSA9IGEtPnN0cmluZzsKLSAg ICAgICAgICAgICAgICAvLyBDU1MgYWxsb3dzIGlkZW50aWZpZXJzIHdpdGggIi0iIGF0IHRoZSBz dGFydCwgbGlrZSAiLXdlYmtpdC1tYXNrLWltYWdlIi4KLSAgICAgICAgICAgICAgICAvLyBCdXQg SFRNTCBhdHRyaWJ1dGUgbmFtZXMgY2FuJ3QgaGF2ZSB0aG9zZSBjaGFyYWN0ZXJzLCBhbmQgd2Ug c2hvdWxkIG5vdAotICAgICAgICAgICAgICAgIC8vIGV2ZW4gcGFyc2UgdGhlbSBpbnNpZGUgYXR0 cigpLgotICAgICAgICAgICAgICAgIGlmIChhdHRyTmFtZVswXSA9PSAnLScpCi0gICAgICAgICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICAgICAgICBpZiAoZG9jdW1lbnQoKS0+ aXNIVE1MRG9jdW1lbnQoKSkKLSAgICAgICAgICAgICAgICAgICAgYXR0ck5hbWUgPSBhdHRyTmFt ZS5sb3dlcigpOwotICAgICAgICAgICAgICAgIHBhcnNlZFZhbHVlID0gQ1NTUHJpbWl0aXZlVmFs dWU6OmNyZWF0ZShhdHRyTmFtZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19BVFRSKTsKICAgICAg ICAgICAgIH0gZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UodmFsLT5mdW5jdGlvbi0+bmFtZSwg ImNvdW50ZXIoIikpIHsKICAgICAgICAgICAgICAgICBwYXJzZWRWYWx1ZSA9IHBhcnNlQ291bnRl ckNvbnRlbnQoYXJncywgZmFsc2UpOwogICAgICAgICAgICAgICAgIGlmICghcGFyc2VkVmFsdWUp CkBAIC0yMDYxLDYgKzIwOTYsMjkgQEAKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK1Bhc3NSZWZQ dHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VBdHRyKENTU1BhcnNlclZhbHVlTGlzdCogYXJn cykKK3sKKyAgICBpZiAoYXJncy0+c2l6ZSgpICE9IDEpCisgICAgICAgIHJldHVybiAwOworCisg ICAgQ1NTUGFyc2VyVmFsdWUqIGEgPSBhcmdzLT5jdXJyZW50KCk7CisKKyAgICBpZiAoYS0+dW5p dCAhPSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX0lERU5UKQorICAgICAgICByZXR1cm4gMDsKKwor ICAgIFN0cmluZyBhdHRyTmFtZSA9IGEtPnN0cmluZzsKKyAgICAvLyBDU1MgYWxsb3dzIGlkZW50 aWZpZXJzIHdpdGggIi0iIGF0IHRoZSBzdGFydCwgbGlrZSAiLXdlYmtpdC1tYXNrLWltYWdlIi4K KyAgICAvLyBCdXQgSFRNTCBhdHRyaWJ1dGUgbmFtZXMgY2FuJ3QgaGF2ZSB0aG9zZSBjaGFyYWN0 ZXJzLCBhbmQgd2Ugc2hvdWxkIG5vdAorICAgIC8vIGV2ZW4gcGFyc2UgdGhlbSBpbnNpZGUgYXR0 cigpLgorICAgIGlmIChhdHRyTmFtZVswXSA9PSAnLScpCisgICAgICAgIHJldHVybiAwOworCisg ICAgaWYgKGRvY3VtZW50KCktPmlzSFRNTERvY3VtZW50KCkpCisgICAgICAgIGF0dHJOYW1lID0g YXR0ck5hbWUubG93ZXIoKTsKKyAgICAKKyAgICByZXR1cm4gQ1NTUHJpbWl0aXZlVmFsdWU6OmNy ZWF0ZShhdHRyTmFtZSwgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19BVFRSKTsKK30KKwogUGFzc1Jl ZlB0cjxDU1NWYWx1ZT4gQ1NTUGFyc2VyOjpwYXJzZUJhY2tncm91bmRDb2xvcigpCiB7CiAgICAg aW50IGlkID0gbV92YWx1ZUxpc3QtPmN1cnJlbnQoKS0+aWQ7CkluZGV4OiBXZWJDb3JlL2Nzcy9D U1NQYXJzZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAkocmV2aXNp b24gNDQ0MTkpCisrKyBXZWJDb3JlL2Nzcy9DU1NQYXJzZXIuaAkod29ya2luZyBjb3B5KQpAQCAt NzUsNiArNzUsOCBAQAogICAgICAgICBib29sIHBhcnNlNFZhbHVlcyhpbnQgcHJvcElkLCBjb25z dCBpbnQqIHByb3BlcnRpZXMsIGJvb2wgaW1wb3J0YW50KTsKICAgICAgICAgYm9vbCBwYXJzZUNv bnRlbnQoaW50IHByb3BJZCwgYm9vbCBpbXBvcnRhbnQpOwogCisgICAgICAgIFBhc3NSZWZQdHI8 Q1NTVmFsdWU+IHBhcnNlQXR0cihDU1NQYXJzZXJWYWx1ZUxpc3QqIGFyZ3MpOworCiAgICAgICAg IFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHBhcnNlQmFja2dyb3VuZENvbG9yKCk7CiAKICAgICAgICAg Ym9vbCBwYXJzZUZpbGxJbWFnZShSZWZQdHI8Q1NTVmFsdWU+Jik7Cg==