60615 2011-05-11 02:38:52 -0700 [EFL] Remove fixed_layout structure in ewk_view 2011-05-11 07:05:10 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 1 gyuyoung.kim gyuyoung.kim antognolli+webkit commit-queue eric kenneth lucas.de.marchi tonikitoo webkit.review.bot oldest_to_newest 401872 0 gyuyoung.kim 2011-05-11 02:38:52 -0700 I don't know why we need to keep fixed_layout structure. We can get the values from ScrollView. I change fixed_layout structure with functions of ScrollView. 401873 1 93093 gyuyoung.kim 2011-05-11 02:41:53 -0700 Created attachment 93093 Proposed Patch 401875 2 webkit.review.bot 2011-05-11 02:43:06 -0700 Attachment 93093 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/efl/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/efl/ewk/ewk_view.cpp:1134: An else statement can be removed when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 401877 3 93095 gyuyoung.kim 2011-05-11 02:46:52 -0700 Created attachment 93095 Patch 401886 4 93100 gyuyoung.kim 2011-05-11 02:59:28 -0700 Created attachment 93100 Modified Patch I am sorry. I need to modify this patch a little bit. 401888 5 webkit.review.bot 2011-05-11 03:02:36 -0700 Attachment 93100 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/efl/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/efl/ewk/ewk_view.cpp:1139: An else should appear on the same line as the preceding } [whitespace/newline] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 401889 6 93101 gyuyoung.kim 2011-05-11 03:07:11 -0700 Created attachment 93101 Patch 401941 7 93101 tonikitoo 2011-05-11 06:44:22 -0700 Comment on attachment 93101 Patch nice clean up! 401945 8 93101 commit-queue 2011-05-11 07:05:05 -0700 Comment on attachment 93101 Patch Clearing flags on attachment: 93101 Committed r86228: <http://trac.webkit.org/changeset/86228> 401946 9 commit-queue 2011-05-11 07:05:10 -0700 All reviewed patches have been landed. Closing bug. 93093 2011-05-11 02:41:53 -0700 2011-05-11 02:46:52 -0700 Proposed Patch patch_fixed_layout.patch text/plain 2888 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5NDhjNThlLi4zOTcyZDkzIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTEgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBz YW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbRUZMXSBSZW1vdmUgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZSBpbiBld2tfdmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA2MTUKKworICAg ICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZS4gVGhlIGV3a192 aWV3X2ZpeGVkX2xheW91dF9zaXplX3NldC9nZXQoKQorICAgICAgICB1c2UgV2ViQ29yZSdzIGZ1 bmN0aW9ucyBkaXJlY3RseS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfZml4 ZWRfbGF5b3V0X3NpemVfZ2V0KToKKwogMjAxMS0wNS0wOCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5r QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA3ZDFlZThkLi43ZTA3YTE5IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTE1MSwxMCArMTUxLDYgQEAgc3RydWN0IF9Fd2tfVmll d19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IGNlbnRlcjsKICAgICAgICAgRWNvcmVfQW5pbWF0 b3IqIGFuaW1hdG9yOwogICAgIH0gYW5pbWF0ZWRfem9vbTsKLSAgICBzdHJ1Y3QgewotICAgICAg ICBFdmFzX0Nvb3JkIHcsIGg7Ci0gICAgICAgIEVpbmFfQm9vbCB1c2U6MTsKLSAgICB9IGZpeGVk X2xheW91dDsKIH07CiAKICNpZm5kZWYgRVdLX1RZUEVfQ0hFQ0sKQEAgLTExMzUsMjcgKzExMzEs MTkgQEAgdm9pZCBld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQoRXZhc19PYmplY3QqIG8s IEV2YXNfQ29vcmQgdywgRXZhc19Db29yZCBoKQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzZCwgcHJpdik7CiAKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzZC0+X3By aXYtPm1haW5fZnJhbWUtPnZpZXcoKTsKLSAgICBpZiAodyA8PSAwICYmIGggPD0gMCkgewotICAg ICAgICBpZiAoIXByaXYtPmZpeGVkX2xheW91dC51c2UpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIHByaXYtPmZpeGVkX2xheW91dC53ID0gMDsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5 b3V0LmggPSAwOwotICAgICAgICBwcml2LT5maXhlZF9sYXlvdXQudXNlID0gRUlOQV9GQUxTRTsK LSAgICB9IGVsc2UgewotICAgICAgICBpZiAocHJpdi0+Zml4ZWRfbGF5b3V0LnVzZQotICAgICAg ICAgICAgJiYgcHJpdi0+Zml4ZWRfbGF5b3V0LncgPT0gdyAmJiBwcml2LT5maXhlZF9sYXlvdXQu aCA9PSBoKQorICAgIGlmICgodyA8PSAwICYmIGggPD0gMCkgJiYgIXZpZXctPnVzZUZpeGVkTGF5 b3V0KCkpCisgICAgICAgIHJldHVybjsKKyAgICBlbHNlIHsKKyAgICAgICAgV2ViQ29yZTo6SW50 U2l6ZSBzaXplID0gdmlldy0+Zml4ZWRMYXlvdXRTaXplKCk7CisgICAgICAgIGlmIChzaXplLndp ZHRoKCkgPT0gdyAmJiBzaXplLmhlaWdodCgpID09IGgpCiAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIHByaXYtPmZpeGVkX2xheW91dC53ID0gdzsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5 b3V0LmggPSBoOwotICAgICAgICBwcml2LT5maXhlZF9sYXlvdXQudXNlID0gRUlOQV9UUlVFOwot CiAgICAgICAgIGlmICh2aWV3KQogICAgICAgICAgICAgdmlldy0+c2V0Rml4ZWRMYXlvdXRTaXpl KFdlYkNvcmU6OkludFNpemUodywgaCkpOwogICAgIH0KIAogICAgIGlmICghdmlldykKICAgICAg ICAgcmV0dXJuOwotICAgIHZpZXctPnNldFVzZUZpeGVkTGF5b3V0KHByaXYtPmZpeGVkX2xheW91 dC51c2UpOworICAgIHZpZXctPnNldFVzZUZpeGVkTGF5b3V0KEVJTkFfVFJVRSk7CiAgICAgdmll dy0+Zm9yY2VMYXlvdXQoKTsKIH0KIApAQCAtMTE3NiwxMSArMTE2NCwxMyBAQCB2b2lkIGV3a192 aWV3X2ZpeGVkX2xheW91dF9zaXplX2dldChFdmFzX09iamVjdCogbywgRXZhc19Db29yZCogdywg RXZhc19Db29yZCogaAogICAgICAgICAqaCA9IDA7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JF VFVSTihvLCBzZCk7CiAgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2KTsK LSAgICBpZiAocHJpdi0+Zml4ZWRfbGF5b3V0LnVzZSkgeworICAgIFdlYkNvcmU6OkZyYW1lVmll dyogdmlldyA9IHNkLT5fcHJpdi0+bWFpbl9mcmFtZS0+dmlldygpOworICAgIGlmICh2aWV3LT51 c2VGaXhlZExheW91dCgpKSB7CisgICAgICAgIFdlYkNvcmU6OkludFNpemUgc2l6ZSA9IHZpZXct PmZpeGVkTGF5b3V0U2l6ZSgpOwogICAgICAgICBpZiAodykKLSAgICAgICAgICAgICp3ID0gcHJp di0+Zml4ZWRfbGF5b3V0Lnc7CisgICAgICAgICAgICAqdyA9IHNpemUud2lkdGgoKTsKICAgICAg ICAgaWYgKGgpCi0gICAgICAgICAgICAqaCA9IHByaXYtPmZpeGVkX2xheW91dC5oOworICAgICAg ICAgICAgKmggPSBzaXplLmhlaWdodCgpOwogICAgIH0KIH0KIAo= 93095 2011-05-11 02:46:52 -0700 2011-05-11 02:59:28 -0700 Patch patch_fixed_layout.patch text/plain 2880 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5NDhjNThlLi4zOTcyZDkzIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTEgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBz YW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbRUZMXSBSZW1vdmUgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZSBpbiBld2tfdmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA2MTUKKworICAg ICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZS4gVGhlIGV3a192 aWV3X2ZpeGVkX2xheW91dF9zaXplX3NldC9nZXQoKQorICAgICAgICB1c2UgV2ViQ29yZSdzIGZ1 bmN0aW9ucyBkaXJlY3RseS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfZml4 ZWRfbGF5b3V0X3NpemVfZ2V0KToKKwogMjAxMS0wNS0wOCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5r QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA3ZDFlZThkLi4yZjI3YmUzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTE1MSwxMCArMTUxLDYgQEAgc3RydWN0IF9Fd2tfVmll d19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IGNlbnRlcjsKICAgICAgICAgRWNvcmVfQW5pbWF0 b3IqIGFuaW1hdG9yOwogICAgIH0gYW5pbWF0ZWRfem9vbTsKLSAgICBzdHJ1Y3QgewotICAgICAg ICBFdmFzX0Nvb3JkIHcsIGg7Ci0gICAgICAgIEVpbmFfQm9vbCB1c2U6MTsKLSAgICB9IGZpeGVk X2xheW91dDsKIH07CiAKICNpZm5kZWYgRVdLX1RZUEVfQ0hFQ0sKQEAgLTExMzUsMjcgKzExMzEs MjAgQEAgdm9pZCBld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQoRXZhc19PYmplY3QqIG8s IEV2YXNfQ29vcmQgdywgRXZhc19Db29yZCBoKQogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzZCwgcHJpdik7CiAKICAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzZC0+X3By aXYtPm1haW5fZnJhbWUtPnZpZXcoKTsKLSAgICBpZiAodyA8PSAwICYmIGggPD0gMCkgewotICAg ICAgICBpZiAoIXByaXYtPmZpeGVkX2xheW91dC51c2UpCisgICAgaWYgKHcgPD0gMCAmJiBoIDw9 IDApCisgICAgICAgIGlmICghdmlldy0+dXNlRml4ZWRMYXlvdXQoKSkKICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LncgPSAwOwotICAgICAgICBwcml2LT5m aXhlZF9sYXlvdXQuaCA9IDA7Ci0gICAgICAgIHByaXYtPmZpeGVkX2xheW91dC51c2UgPSBFSU5B X0ZBTFNFOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIGlmIChwcml2LT5maXhlZF9sYXlvdXQudXNl Ci0gICAgICAgICAgICAmJiBwcml2LT5maXhlZF9sYXlvdXQudyA9PSB3ICYmIHByaXYtPmZpeGVk X2xheW91dC5oID09IGgpCisgICAgZWxzZSB7CisgICAgICAgIFdlYkNvcmU6OkludFNpemUgc2l6 ZSA9IHZpZXctPmZpeGVkTGF5b3V0U2l6ZSgpOworICAgICAgICBpZiAoc2l6ZS53aWR0aCgpID09 IHcgJiYgc2l6ZS5oZWlnaHQoKSA9PSBoKQogICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICBw cml2LT5maXhlZF9sYXlvdXQudyA9IHc7Ci0gICAgICAgIHByaXYtPmZpeGVkX2xheW91dC5oID0g aDsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LnVzZSA9IEVJTkFfVFJVRTsKLQogICAgICAg ICBpZiAodmlldykKICAgICAgICAgICAgIHZpZXctPnNldEZpeGVkTGF5b3V0U2l6ZShXZWJDb3Jl OjpJbnRTaXplKHcsIGgpKTsKICAgICB9CiAKICAgICBpZiAoIXZpZXcpCiAgICAgICAgIHJldHVy bjsKLSAgICB2aWV3LT5zZXRVc2VGaXhlZExheW91dChwcml2LT5maXhlZF9sYXlvdXQudXNlKTsK KyAgICB2aWV3LT5zZXRVc2VGaXhlZExheW91dChFSU5BX1RSVUUpOwogICAgIHZpZXctPmZvcmNl TGF5b3V0KCk7CiB9CiAKQEAgLTExNzYsMTEgKzExNjUsMTMgQEAgdm9pZCBld2tfdmlld19maXhl ZF9sYXlvdXRfc2l6ZV9nZXQoRXZhc19PYmplY3QqIG8sIEV2YXNfQ29vcmQqIHcsIEV2YXNfQ29v cmQqIGgKICAgICAgICAgKmggPSAwOwogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywg c2QpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdik7Ci0gICAgaWYg KHByaXYtPmZpeGVkX2xheW91dC51c2UpIHsKKyAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcg PSBzZC0+X3ByaXYtPm1haW5fZnJhbWUtPnZpZXcoKTsKKyAgICBpZiAodmlldy0+dXNlRml4ZWRM YXlvdXQoKSkgeworICAgICAgICBXZWJDb3JlOjpJbnRTaXplIHNpemUgPSB2aWV3LT5maXhlZExh eW91dFNpemUoKTsKICAgICAgICAgaWYgKHcpCi0gICAgICAgICAgICAqdyA9IHByaXYtPmZpeGVk X2xheW91dC53OworICAgICAgICAgICAgKncgPSBzaXplLndpZHRoKCk7CiAgICAgICAgIGlmICho KQotICAgICAgICAgICAgKmggPSBwcml2LT5maXhlZF9sYXlvdXQuaDsKKyAgICAgICAgICAgICpo ID0gc2l6ZS5oZWlnaHQoKTsKICAgICB9CiB9CiAK 93100 2011-05-11 02:59:28 -0700 2011-05-11 03:07:11 -0700 Modified Patch patch_fixed_layout.patch text/plain 2998 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5NDhjNThlLi4zOTcyZDkzIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTEgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBz YW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbRUZMXSBSZW1vdmUgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZSBpbiBld2tfdmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA2MTUKKworICAg ICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZS4gVGhlIGV3a192 aWV3X2ZpeGVkX2xheW91dF9zaXplX3NldC9nZXQoKQorICAgICAgICB1c2UgV2ViQ29yZSdzIGZ1 bmN0aW9ucyBkaXJlY3RseS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfZml4 ZWRfbGF5b3V0X3NpemVfZ2V0KToKKwogMjAxMS0wNS0wOCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5r QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA3ZDFlZThkLi43NmVhN2IzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTE1MSwxMCArMTUxLDYgQEAgc3RydWN0IF9Fd2tfVmll d19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IGNlbnRlcjsKICAgICAgICAgRWNvcmVfQW5pbWF0 b3IqIGFuaW1hdG9yOwogICAgIH0gYW5pbWF0ZWRfem9vbTsKLSAgICBzdHJ1Y3QgewotICAgICAg ICBFdmFzX0Nvb3JkIHcsIGg7Ci0gICAgICAgIEVpbmFfQm9vbCB1c2U6MTsKLSAgICB9IGZpeGVk X2xheW91dDsKIH07CiAKICNpZm5kZWYgRVdLX1RZUEVfQ0hFQ0sKQEAgLTExMzQsMjggKzExMzAs MjMgQEAgdm9pZCBld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQoRXZhc19PYmplY3QqIG8s IEV2YXNfQ29vcmQgdywgRXZhc19Db29yZCBoKQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRV Uk4obywgc2QpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdik7CiAK LSAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzZC0+X3ByaXYtPm1haW5fZnJhbWUtPnZp ZXcoKTsKKyAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBwcml2LT5tYWluX2ZyYW1lLT52 aWV3KCk7CiAgICAgaWYgKHcgPD0gMCAmJiBoIDw9IDApIHsKLSAgICAgICAgaWYgKCFwcml2LT5m aXhlZF9sYXlvdXQudXNlKQorICAgICAgICBpZiAoIXZpZXctPnVzZUZpeGVkTGF5b3V0KCkpCiAg ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHByaXYtPmZpeGVkX2xheW91dC53ID0gMDsKLSAg ICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LmggPSAwOwotICAgICAgICBwcml2LT5maXhlZF9sYXlv dXQudXNlID0gRUlOQV9GQUxTRTsKLSAgICB9IGVsc2UgewotICAgICAgICBpZiAocHJpdi0+Zml4 ZWRfbGF5b3V0LnVzZQotICAgICAgICAgICAgJiYgcHJpdi0+Zml4ZWRfbGF5b3V0LncgPT0gdyAm JiBwcml2LT5maXhlZF9sYXlvdXQuaCA9PSBoKQorICAgICAgICB2aWV3LT5zZXRVc2VGaXhlZExh eW91dChFSU5BX0ZBTFNFKTsKKyAgICB9CisgICAgZWxzZSB7CisgICAgICAgIFdlYkNvcmU6Oklu dFNpemUgc2l6ZSA9IHZpZXctPmZpeGVkTGF5b3V0U2l6ZSgpOworICAgICAgICBpZiAoc2l6ZS53 aWR0aCgpID09IHcgJiYgc2l6ZS5oZWlnaHQoKSA9PSBoKQogICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICBwcml2LT5maXhlZF9sYXlvdXQudyA9IHc7Ci0gICAgICAgIHByaXYtPmZpeGVkX2xh eW91dC5oID0gaDsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LnVzZSA9IEVJTkFfVFJVRTsK LQogICAgICAgICBpZiAodmlldykKICAgICAgICAgICAgIHZpZXctPnNldEZpeGVkTGF5b3V0U2l6 ZShXZWJDb3JlOjpJbnRTaXplKHcsIGgpKTsKICAgICB9CiAKICAgICBpZiAoIXZpZXcpCiAgICAg ICAgIHJldHVybjsKLSAgICB2aWV3LT5zZXRVc2VGaXhlZExheW91dChwcml2LT5maXhlZF9sYXlv dXQudXNlKTsKKyAgICB2aWV3LT5zZXRVc2VGaXhlZExheW91dChFSU5BX1RSVUUpOwogICAgIHZp ZXctPmZvcmNlTGF5b3V0KCk7CiB9CiAKQEAgLTExNzYsMTEgKzExNjcsMTMgQEAgdm9pZCBld2tf dmlld19maXhlZF9sYXlvdXRfc2l6ZV9nZXQoRXZhc19PYmplY3QqIG8sIEV2YXNfQ29vcmQqIHcs IEV2YXNfQ29vcmQqIGgKICAgICAgICAgKmggPSAwOwogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9S RVRVUk4obywgc2QpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdik7 Ci0gICAgaWYgKHByaXYtPmZpeGVkX2xheW91dC51c2UpIHsKKyAgICBXZWJDb3JlOjpGcmFtZVZp ZXcqIHZpZXcgPSBwcml2LT5tYWluX2ZyYW1lLT52aWV3KCk7CisgICAgaWYgKHZpZXctPnVzZUZp eGVkTGF5b3V0KCkpIHsKKyAgICAgICAgV2ViQ29yZTo6SW50U2l6ZSBzaXplID0gdmlldy0+Zml4 ZWRMYXlvdXRTaXplKCk7CiAgICAgICAgIGlmICh3KQotICAgICAgICAgICAgKncgPSBwcml2LT5m aXhlZF9sYXlvdXQudzsKKyAgICAgICAgICAgICp3ID0gc2l6ZS53aWR0aCgpOwogICAgICAgICBp ZiAoaCkKLSAgICAgICAgICAgICpoID0gcHJpdi0+Zml4ZWRfbGF5b3V0Lmg7CisgICAgICAgICAg ICAqaCA9IHNpemUuaGVpZ2h0KCk7CiAgICAgfQogfQogCg== 93101 2011-05-11 03:07:11 -0700 2011-05-11 07:05:04 -0700 Patch patch_fixed_layout.patch text/plain 2979 gyuyoung.kim ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5NDhjNThlLi4zOTcyZDkzIDEwMDc1NQotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDUtMTEgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBz YW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbRUZMXSBSZW1vdmUgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZSBpbiBld2tfdmlldworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA2MTUKKworICAg ICAgICBSZW1vdmUgdW5uZWNlc3NhcnkgZml4ZWRfbGF5b3V0IHN0cnVjdHVyZS4gVGhlIGV3a192 aWV3X2ZpeGVkX2xheW91dF9zaXplX3NldC9nZXQoKQorICAgICAgICB1c2UgV2ViQ29yZSdzIGZ1 bmN0aW9ucyBkaXJlY3RseS4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAg IChld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQpOgorICAgICAgICAoZXdrX3ZpZXdfZml4 ZWRfbGF5b3V0X3NpemVfZ2V0KToKKwogMjAxMS0wNS0wOCAgS2FtaWwgQmxhbmsgIDxrLmJsYW5r QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA3ZDFlZThkLi42YTQyN2RmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTE1MSwxMCArMTUxLDYgQEAgc3RydWN0IF9Fd2tfVmll d19Qcml2YXRlX0RhdGEgewogICAgICAgICB9IGNlbnRlcjsKICAgICAgICAgRWNvcmVfQW5pbWF0 b3IqIGFuaW1hdG9yOwogICAgIH0gYW5pbWF0ZWRfem9vbTsKLSAgICBzdHJ1Y3QgewotICAgICAg ICBFdmFzX0Nvb3JkIHcsIGg7Ci0gICAgICAgIEVpbmFfQm9vbCB1c2U6MTsKLSAgICB9IGZpeGVk X2xheW91dDsKIH07CiAKICNpZm5kZWYgRVdLX1RZUEVfQ0hFQ0sKQEAgLTExMzQsMjggKzExMzAs MjIgQEAgdm9pZCBld2tfdmlld19maXhlZF9sYXlvdXRfc2l6ZV9zZXQoRXZhc19PYmplY3QqIG8s IEV2YXNfQ29vcmQgdywgRXZhc19Db29yZCBoKQogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRV Uk4obywgc2QpOwogICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdik7CiAK LSAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBzZC0+X3ByaXYtPm1haW5fZnJhbWUtPnZp ZXcoKTsKKyAgICBXZWJDb3JlOjpGcmFtZVZpZXcqIHZpZXcgPSBwcml2LT5tYWluX2ZyYW1lLT52 aWV3KCk7CiAgICAgaWYgKHcgPD0gMCAmJiBoIDw9IDApIHsKLSAgICAgICAgaWYgKCFwcml2LT5m aXhlZF9sYXlvdXQudXNlKQorICAgICAgICBpZiAoIXZpZXctPnVzZUZpeGVkTGF5b3V0KCkpCiAg ICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHByaXYtPmZpeGVkX2xheW91dC53ID0gMDsKLSAg ICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LmggPSAwOwotICAgICAgICBwcml2LT5maXhlZF9sYXlv dXQudXNlID0gRUlOQV9GQUxTRTsKKyAgICAgICAgdmlldy0+c2V0VXNlRml4ZWRMYXlvdXQoRUlO QV9GQUxTRSk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgaWYgKHByaXYtPmZpeGVkX2xheW91dC51 c2UKLSAgICAgICAgICAgICYmIHByaXYtPmZpeGVkX2xheW91dC53ID09IHcgJiYgcHJpdi0+Zml4 ZWRfbGF5b3V0LmggPT0gaCkKKyAgICAgICAgV2ViQ29yZTo6SW50U2l6ZSBzaXplID0gdmlldy0+ Zml4ZWRMYXlvdXRTaXplKCk7CisgICAgICAgIGlmIChzaXplLndpZHRoKCkgPT0gdyAmJiBzaXpl LmhlaWdodCgpID09IGgpCiAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIHByaXYtPmZpeGVk X2xheW91dC53ID0gdzsKLSAgICAgICAgcHJpdi0+Zml4ZWRfbGF5b3V0LmggPSBoOwotICAgICAg ICBwcml2LT5maXhlZF9sYXlvdXQudXNlID0gRUlOQV9UUlVFOwotCiAgICAgICAgIGlmICh2aWV3 KQogICAgICAgICAgICAgdmlldy0+c2V0Rml4ZWRMYXlvdXRTaXplKFdlYkNvcmU6OkludFNpemUo dywgaCkpOwogICAgIH0KIAogICAgIGlmICghdmlldykKICAgICAgICAgcmV0dXJuOwotICAgIHZp ZXctPnNldFVzZUZpeGVkTGF5b3V0KHByaXYtPmZpeGVkX2xheW91dC51c2UpOworICAgIHZpZXct PnNldFVzZUZpeGVkTGF5b3V0KEVJTkFfVFJVRSk7CiAgICAgdmlldy0+Zm9yY2VMYXlvdXQoKTsK IH0KIApAQCAtMTE3NiwxMSArMTE2NiwxMyBAQCB2b2lkIGV3a192aWV3X2ZpeGVkX2xheW91dF9z aXplX2dldChFdmFzX09iamVjdCogbywgRXZhc19Db29yZCogdywgRXZhc19Db29yZCogaAogICAg ICAgICAqaCA9IDA7CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCk7CiAgICAg RVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2KTsKLSAgICBpZiAocHJpdi0+Zml4 ZWRfbGF5b3V0LnVzZSkgeworICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IHByaXYtPm1h aW5fZnJhbWUtPnZpZXcoKTsKKyAgICBpZiAodmlldy0+dXNlRml4ZWRMYXlvdXQoKSkgeworICAg ICAgICBXZWJDb3JlOjpJbnRTaXplIHNpemUgPSB2aWV3LT5maXhlZExheW91dFNpemUoKTsKICAg ICAgICAgaWYgKHcpCi0gICAgICAgICAgICAqdyA9IHByaXYtPmZpeGVkX2xheW91dC53OworICAg ICAgICAgICAgKncgPSBzaXplLndpZHRoKCk7CiAgICAgICAgIGlmIChoKQotICAgICAgICAgICAg KmggPSBwcml2LT5maXhlZF9sYXlvdXQuaDsKKyAgICAgICAgICAgICpoID0gc2l6ZS5oZWlnaHQo KTsKICAgICB9CiB9CiAK