57122 2011-03-25 14:28:04 -0700 Fix compilation with Solaris 10/Sun Studio 12 CC : types must match on ?: 2011-03-25 17:30:59 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Other RESOLVED FIXED P2 Normal --- 0 bentaylor.solx86 webkit-unassigned commit-queue oldest_to_newest 373726 0 bentaylor.solx86 2011-03-25 14:28:04 -0700 "loader/DocumentLoader.h", line 186: Error: Different types for "?:" (WebCore::String and WebCore::KURL). Sun Studio 12 expects types on a ?: expression to have the same types on both sides of the operation. 373730 1 86983 bentaylor.solx86 2011-03-25 14:35:27 -0700 Created attachment 86983 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler Patch to fix compile on Solaris 10/Sun Studio 12 in qt-4.7.1 with webkit. Patch against webkit head. original version of this patch attributed to Thiago Macieira. 373806 2 86983 commit-queue 2011-03-25 17:30:54 -0700 Comment on attachment 86983 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler Clearing flags on attachment: 86983 Committed r82010: <http://trac.webkit.org/changeset/82010> 373807 3 commit-queue 2011-03-25 17:30:59 -0700 All reviewed patches have been landed. Closing bug. 86983 2011-03-25 14:35:27 -0700 2011-03-25 17:30:54 -0700 Proposed patch which compiles correctly in qt-4.7.1 with webkit enabled on Solaris 10 with SS12 C++ compiler webkit-bug-57122-WebCore-loader.diff text/plain 3618 bentaylor.solx86 SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxOTkwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMjUgIEJlbiBUYXls b3IgIDxiZW50YXlsb3Iuc29seDg2QGdtYWlsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NTcxMjIuIFNvbGFyaXMgMTAvU3VuU3R1ZGlvIDEyIGV4cGVjdAorICAgICAgICBi b3RoIHNpZGVzIG9mIGEgPzogb3BlcmF0aW9uIHRvIGhhdmUgdGhlIHNhbWUgdHlwZXMuICBFeHRy YWN0ZWQgZnJvbSBvcmlnaW5hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjQ5MzIsIHBhdGNoIDEzIG9mIDE3LCBhbmQgb3JpZ2luYWxseQorICAgICAg ICBjcmVhdGVkIGJ5IFRoaWFnbyBNYWNpZWlyYS4KKworICAgICAgICBmaXhlcyBhIGNvbXBpbGUg aXNzdWUgb24gU29sYXJpcyAxMC9TdW5TdHVkaW8gMTIKKworICAgICAgICAqIGxvYWRlci9Eb2N1 bWVudExvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRMb2FkZXI6OnNlcnZlclJl ZGlyZWN0U291cmNlRm9ySGlzdG9yeSk6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpsb2FkKToKKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkV2l0aE5hdmlnYXRpb25BY3Rpb24pOgorCiAyMDExLTAzLTI1 ICBNYXJ0aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KIAogICAgICAgICBGaXgg dGhlIEdUSysgYnVpbGQgdW50aWwgd2UgY2FuIGltcGxlbWVudCB0aGUgbmV3IGNyb3NzLXBsYXRm b3JtCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkocmV2aXNpb24g ODE5ODkpCisrKyBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTgzLDcgKzE4Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg U3RyaW5nIGNsaWVudFJlZGlyZWN0RGVzdGluYXRpb25Gb3JIaXN0b3J5KCkgY29uc3QgeyByZXR1 cm4gdXJsRm9ySGlzdG9yeSgpOyB9CiAgICAgICAgIHZvaWQgc2V0Q2xpZW50UmVkaXJlY3RTb3Vy Y2VGb3JIaXN0b3J5KGNvbnN0IFN0cmluZyYgY2xpZW50ZWRpcmVjdFNvdXJjZUZvckhpc3Rvcnkp IHsgbV9jbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkgPSBjbGllbnRlZGlyZWN0U291cmNl Rm9ySGlzdG9yeTsgfQogICAgICAgICAKLSAgICAgICAgU3RyaW5nIHNlcnZlclJlZGlyZWN0U291 cmNlRm9ySGlzdG9yeSgpIGNvbnN0IHsgcmV0dXJuIHVybEZvckhpc3RvcnkoKSA9PSB1cmwoKSA/ IFN0cmluZygpIDogdXJsRm9ySGlzdG9yeSgpOyB9IC8vIG51bGwgaWYgbm8gc2VydmVyIHJlZGly ZWN0IG9jY3VycmVkLgorICAgICAgICBTdHJpbmcgc2VydmVyUmVkaXJlY3RTb3VyY2VGb3JIaXN0 b3J5KCkgY29uc3QgeyByZXR1cm4gdXJsRm9ySGlzdG9yeSgpID09IHVybCgpID8gU3RyaW5nKCkg OiB1cmxGb3JIaXN0b3J5KCkuc3RyaW5nKCk7IH0gLy8gbnVsbCBpZiBubyBzZXJ2ZXIgcmVkaXJl Y3Qgb2NjdXJyZWQuCiAgICAgICAgIFN0cmluZyBzZXJ2ZXJSZWRpcmVjdERlc3RpbmF0aW9uRm9y SGlzdG9yeSgpIGNvbnN0IHsgcmV0dXJuIHVybCgpOyB9CiAKICAgICAgICAgYm9vbCBkaWRDcmVh dGVHbG9iYWxIaXN0b3J5RW50cnkoKSBjb25zdCB7IHJldHVybiBtX2RpZENyZWF0ZUdsb2JhbEhp c3RvcnlFbnRyeTsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShy ZXZpc2lvbiA4MTk4OSkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTE0MDUsNyArMTQwNSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6Omxv YWQoY29uc3QgUmVzb3VyY2VSZXEKICAgICBtX2xvYWRUeXBlID0gRnJhbWVMb2FkVHlwZVN0YW5k YXJkOwogICAgIFJlZlB0cjxEb2N1bWVudExvYWRlcj4gbG9hZGVyID0gbV9jbGllbnQtPmNyZWF0 ZURvY3VtZW50TG9hZGVyKHJlcXVlc3QsIHN1YnN0aXR1dGVEYXRhKTsKICAgICBpZiAobG9ja0hp c3RvcnkgJiYgbV9kb2N1bWVudExvYWRlcikKLSAgICAgICAgbG9hZGVyLT5zZXRDbGllbnRSZWRp cmVjdFNvdXJjZUZvckhpc3RvcnkobV9kb2N1bWVudExvYWRlci0+ZGlkQ3JlYXRlR2xvYmFsSGlz dG9yeUVudHJ5KCkgPyBtX2RvY3VtZW50TG9hZGVyLT51cmxGb3JIaXN0b3J5KCkgOiBtX2RvY3Vt ZW50TG9hZGVyLT5jbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkoKSk7CisgICAgICAgIGxv YWRlci0+c2V0Q2xpZW50UmVkaXJlY3RTb3VyY2VGb3JIaXN0b3J5KG1fZG9jdW1lbnRMb2FkZXIt PmRpZENyZWF0ZUdsb2JhbEhpc3RvcnlFbnRyeSgpID8gbV9kb2N1bWVudExvYWRlci0+dXJsRm9y SGlzdG9yeSgpLnN0cmluZygpIDogbV9kb2N1bWVudExvYWRlci0+Y2xpZW50UmVkaXJlY3RTb3Vy Y2VGb3JIaXN0b3J5KCkpOwogICAgIGxvYWQobG9hZGVyLmdldCgpKTsKIH0KIApAQCAtMTQyOSw3 ICsxNDI5LDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFdpdGhOYXZpZ2F0aW9uQWN0aQogewog ICAgIFJlZlB0cjxEb2N1bWVudExvYWRlcj4gbG9hZGVyID0gbV9jbGllbnQtPmNyZWF0ZURvY3Vt ZW50TG9hZGVyKHJlcXVlc3QsIFN1YnN0aXR1dGVEYXRhKCkpOwogICAgIGlmIChsb2NrSGlzdG9y eSAmJiBtX2RvY3VtZW50TG9hZGVyKQotICAgICAgICBsb2FkZXItPnNldENsaWVudFJlZGlyZWN0 U291cmNlRm9ySGlzdG9yeShtX2RvY3VtZW50TG9hZGVyLT5kaWRDcmVhdGVHbG9iYWxIaXN0b3J5 RW50cnkoKSA/IG1fZG9jdW1lbnRMb2FkZXItPnVybEZvckhpc3RvcnkoKSA6IG1fZG9jdW1lbnRM b2FkZXItPmNsaWVudFJlZGlyZWN0U291cmNlRm9ySGlzdG9yeSgpKTsKKyAgICAgICAgbG9hZGVy LT5zZXRDbGllbnRSZWRpcmVjdFNvdXJjZUZvckhpc3RvcnkobV9kb2N1bWVudExvYWRlci0+ZGlk Q3JlYXRlR2xvYmFsSGlzdG9yeUVudHJ5KCkgPyBtX2RvY3VtZW50TG9hZGVyLT51cmxGb3JIaXN0 b3J5KCkuc3RyaW5nKCkgOiBtX2RvY3VtZW50TG9hZGVyLT5jbGllbnRSZWRpcmVjdFNvdXJjZUZv ckhpc3RvcnkoKSk7CiAKICAgICBsb2FkZXItPnNldFRyaWdnZXJpbmdBY3Rpb24oYWN0aW9uKTsK ICAgICBpZiAobV9kb2N1bWVudExvYWRlcikK