105885 2012-12-31 06:04:44 -0800 [WK2] Rename SetFrameInViewSourceMode to SetMainFrameInViewSourceMode 2013-01-02 09:43:33 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned andersca gustavo mrobinson sam webkit.review.bot oldest_to_newest 798340 0 cgarcia 2012-12-31 06:04:44 -0800 Right after landing r138593 I've noticed a side effect. Something as easy as: webkit_web_view_new () webkit_web_view_set_view_mode (SOURCE); webkit_web_view_load_uri (); doesn't work, and the page is loaded in web mode. the problem is that at that point the main frame proxy hasn't been created yet. Since what we want is actually to change only the main frame view suorce mode, we could rename SetFrameInViewSourceMode to SetMainFrameInViewSourceMode and we don't need a frameID anymore. The code is also more simple. 798341 1 180972 cgarcia 2012-12-31 06:08:32 -0800 Created attachment 180972 Patch 798343 2 webkit.review.bot 2012-12-31 06:10:46 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 798344 3 webkit.review.bot 2012-12-31 06:11:10 -0800 Attachment 180972 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit2/ChangeLog', u'Source/WebKit..." exit_code: 1 Source/WebKit2/WebProcess/WebPage/WebPage.h:794: The parameter name "inViewSourceMode" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WebKit2/UIProcess/WebPageProxy.h:775: The parameter name "inViewSourceMode" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 798345 4 180973 cgarcia 2012-12-31 06:15:10 -0800 Created attachment 180973 Fix style issues 798699 5 cgarcia 2013-01-02 09:43:33 -0800 Committed r138622: <http://trac.webkit.org/changeset/138622> 180972 2012-12-31 06:08:32 -0800 2012-12-31 06:15:10 -0800 Patch wk2-view-source2.diff text/plain 7229 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2ODZhMjEzLi5kNjk5ZWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQg QEAKIDIwMTItMTItMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtXSzJdIFJlbmFtZSBTZXRGcmFtZUluVmlld1NvdXJjZU1vZGUgdG8gU2V0 TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyB3YXkgd2UgZG9uJ3QgZGVwZW5kIG9uIGEgV2ViRnJhbWVQ cm94eSBhbmQKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUoKSB3b3JrcyBl dmVuIGlmIHRoZSBtYWluIGZyYW1lIHByb3h5CisgICAgICAgIGhhc24ndCBiZWVuIGNyZWF0ZWQg eWV0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6Cisg ICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZSk6IENhbGwKKyAgICAgICAgV2Vi UGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKCkgZGlyZWN0bHkuCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJG cmFtZVByb3h5OjpXZWJGcmFtZVByb3h5KTogUmVtb3ZlCisgICAgICAgIHNldEluVmlld1NvdXJj ZU1vZGUoKS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oOgorICAgICAgICAo V2ViRnJhbWVQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9k ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViUGFn ZVByb3h5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgIChXZWJQYWdlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKworMjAx Mi0xMi0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAg ICAgICAgW0dUS10gQWRkIEFQSSB0byBzZXQgYSBXZWJLaXRXZWJWaWV3IGluIHZpZXcgc291cmNl IG1vZGUgdG8gV2ViS2l0MgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTkzMTUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA2YTRlNjRlLi5kMGVjOGM5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMjg5 OCwxMSArMjg5OCw3IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUoV2ViS2l0 V2ViVmlldyogd2ViVmlldywgV2ViS2l0Vmlld01vZGUgdmlld01vCiAgICAgaWYgKHdlYlZpZXct PnByaXYtPnZpZXdNb2RlID09IHZpZXdNb2RlKQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IGdldFBhZ2Uod2ViVmlldyktPm1haW5GcmFtZSgpOwotICAgIGlm ICghZnJhbWUpCi0gICAgICAgIHJldHVybjsKLQotICAgIGZyYW1lLT5zZXRJblZpZXdTb3VyY2VN b2RlKHZpZXdNb2RlID09IFdFQktJVF9WSUVXX01PREVfU09VUkNFKTsKKyAgICBnZXRQYWdlKHdl YlZpZXcpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKHZpZXdNb2RlID09IFdFQktJVF9W SUVXX01PREVfU09VUkNFKTsKIAogICAgIHdlYlZpZXctPnByaXYtPnZpZXdNb2RlID0gdmlld01v ZGU7CiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAidmlldy1tb2RlIik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggZmIzNGFi Ny4uZjYwZmFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1l UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cApAQCAtNTEsNyArNTEsNiBAQCBXZWJGcmFtZVByb3h5OjpXZWJGcmFtZVByb3h5KFdlYlBhZ2VQ cm94eSogcGFnZSwgdWludDY0X3QgZnJhbWVJRCkKICAgICAsIG1fbGFzdENoaWxkKDApCiAgICAg LCBtX2xvYWRTdGF0ZShMb2FkU3RhdGVGaW5pc2hlZCkKICAgICAsIG1faXNGcmFtZVNldChmYWxz ZSkKLSAgICAsIG1faW5WaWV3U291cmNlTW9kZShmYWxzZSkKICAgICAsIG1fZnJhbWVJRChmcmFt ZUlEKQogewogICAgIFdlYkNvbnRleHQ6OnN0YXRpc3RpY3MoKS53a0ZyYW1lQ291bnQrKzsKQEAg LTEzOCwxNSArMTM3LDYgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc0Rpc3BsYXlpbmdQREZEb2N1 bWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIFdlYkNvbnRleHQ6OnBkZkFuZFBvc3RTY3JpcHRNSU1F VHlwZXMoKS5jb250YWlucyhtX01JTUVUeXBlKTsKIH0KIAotdm9pZCBXZWJGcmFtZVByb3h5Ojpz ZXRJblZpZXdTb3VyY2VNb2RlKGJvb2wgbW9kZSkKLXsKLSAgICBpZiAobV9pblZpZXdTb3VyY2VN b2RlID09IG1vZGUpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1faW5WaWV3U291cmNlTW9kZSA9 IG1vZGU7Ci0gICAgbV9wYWdlLT5zZXRGcmFtZUluVmlld1NvdXJjZU1vZGUodGhpcywgbV9pblZp ZXdTb3VyY2VNb2RlKTsKLX0KLQogdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRTdGFydFByb3Zpc2lv bmFsTG9hZChjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBBU1NFUlQobV9sb2FkU3RhdGUgPT0g TG9hZFN0YXRlRmluaXNoZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkZyYW1lUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5 LmgKaW5kZXggMjBjY2MzMi4uZGU1YTU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkZyYW1lUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5oCkBAIC0xMDgsOSArMTA4LDYgQEAgcHVibGljOgogICAgIGJvb2wgaXNEaXNw bGF5aW5nTWFya3VwRG9jdW1lbnQoKSBjb25zdDsKICAgICBib29sIGlzRGlzcGxheWluZ1BERkRv Y3VtZW50KCkgY29uc3Q7CiAKLSAgICBib29sIGluVmlld1NvdXJjZU1vZGUoKSBjb25zdCB7IHJl dHVybiBtX2luVmlld1NvdXJjZU1vZGU7IH0KLSAgICB2b2lkIHNldEluVmlld1NvdXJjZU1vZGUo Ym9vbCk7Ci0KICAgICB2b2lkIGdldFdlYkFyY2hpdmUoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+ KTsKICAgICB2b2lkIGdldE1haW5SZXNvdXJjZURhdGEoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+ KTsKICAgICB2b2lkIGdldFJlc291cmNlRGF0YShXZWJVUkwqLCBQYXNzUmVmUHRyPERhdGFDYWxs YmFjaz4pOwpAQCAtMTU3LDcgKzE1NCw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fTUlNRVR5 cGU7CiAgICAgU3RyaW5nIG1fdGl0bGU7CiAgICAgYm9vbCBtX2lzRnJhbWVTZXQ7Ci0gICAgYm9v bCBtX2luVmlld1NvdXJjZU1vZGU7CiAgICAgUmVmUHRyPFdlYkNlcnRpZmljYXRlSW5mbz4gbV9j ZXJ0aWZpY2F0ZUluZm87CiAgICAgUmVmUHRyPFdlYkZyYW1lTGlzdGVuZXJQcm94eT4gbV9hY3Rp dmVMaXN0ZW5lcjsKICAgICB1aW50NjRfdCBtX2ZyYW1lSUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDdjOTMzOTIuLjk1NmJmMDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MjU3LDkgKzQyNTcsOSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6Y2FuY2VsQ29tcG9zaXRpb24oKQogfQogI2VuZGlmIC8vIFBMQVRG T1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRGcmFtZUlu Vmlld1NvdXJjZU1vZGUoV2ViRnJhbWVQcm94eSogZnJhbWUsIGJvb2wgaW5WaWV3U291cmNlTW9k ZSkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wg aW5WaWV3U291cmNlTW9kZSkKIHsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldEZyYW1lSW5WaWV3U291cmNlTW9kZShmcmFtZS0+ZnJhbWVJRCgpLCBpblZpZXdTb3Vy Y2VNb2RlKSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKSwgbV9wYWdl SUQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAppbmRleCBiOGEwYjY3Li5iMTYxOTVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03NzIsNyArNzcyLDcgQEAgcHVibGljOgogICAgIGRv dWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX21pbmltdW1MYXlvdXRX aWR0aDsgfQogICAgIHZvaWQgc2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSk7CiAKLSAgICB2 b2lkIHNldEZyYW1lSW5WaWV3U291cmNlTW9kZShXZWJGcmFtZVByb3h5KiwgYm9vbCBpblZpZXdT b3VyY2VNb2RlKTsKKyAgICB2b2lkIHNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBp blZpZXdTb3VyY2VNb2RlKTsKIAogcHJpdmF0ZToKICAgICBXZWJQYWdlUHJveHkoUGFnZUNsaWVu dCosIFBhc3NSZWZQdHI8V2ViUHJvY2Vzc1Byb3h5PiwgV2ViUGFnZUdyb3VwKiwgdWludDY0X3Qg cGFnZUlEKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAppbmRleCAwYzJkODRmLi45MThlMTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0zNzYzLDEwICszNzYzLDkgQEAgdm9pZCBXZWJQYWdl OjpjYW5jZWxDb21wb3NpdGlvbihFZGl0b3JTdGF0ZSYgbmV3U3RhdGUpCiB9CiAjZW5kaWYKIAot dm9pZCBXZWJQYWdlOjpzZXRGcmFtZUluVmlld1NvdXJjZU1vZGUodWludDY0X3QgZnJhbWVJRCwg Ym9vbCBpblZpZXdTb3VyY2VNb2RlKQordm9pZCBXZWJQYWdlOjpzZXRNYWluRnJhbWVJblZpZXdT b3VyY2VNb2RlKGJvb2wgaW5WaWV3U291cmNlTW9kZSkKIHsKLSAgICBpZiAoV2ViRnJhbWUqIGZy YW1lID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkud2ViRnJhbWUoZnJhbWVJRCkpCi0gICAgICAgIGZy YW1lLT5jb3JlRnJhbWUoKS0+c2V0SW5WaWV3U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKTsK KyAgICBtX21haW5GcmFtZS0+Y29yZUZyYW1lKCktPnNldEluVmlld1NvdXJjZU1vZGUoaW5WaWV3 U291cmNlTW9kZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMzAyNWI5Mi4uZjNkYzVmYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC03OTEsNyAr NzkxLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgY2FuSGFuZGxlVXNlckV2ZW50cygpIGNvbnN0 OwogCi0gICAgdm9pZCBzZXRGcmFtZUluVmlld1NvdXJjZU1vZGUodWludDY0X3QgZnJhbWVJRCwg Ym9vbCBpblZpZXdTb3VyY2VNb2RlKTsKKyAgICB2b2lkIHNldE1haW5GcmFtZUluVmlld1NvdXJj ZU1vZGUoYm9vbCBpblZpZXdTb3VyY2VNb2RlKTsKIAogICAgIHN0YXRpYyBib29sIHBsYXRmb3Jt Q2FuSGFuZGxlUmVxdWVzdChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2Fn ZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdl cy5pbgppbmRleCA1YTNmYTkwLi43NGU1ZmNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbgpAQCAtMzE1LDUgKzMxNSw1 IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgewogICAgIFNldEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdX aW5kb3dJZChpbnQ2NF90IGlkKQogI2VuZGlmCiAKLSAgICBTZXRGcmFtZUluVmlld1NvdXJjZU1v ZGUodWludDY0X3QgZnJhbWVJRCwgYm9vbCBpblZpZXdTb3VyY2VNb2RlKQorICAgIFNldE1haW5G cmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCBpblZpZXdTb3VyY2VNb2RlKQogfQo= 180973 2012-12-31 06:15:10 -0800 2013-01-02 09:26:52 -0800 Fix style issues wk2-view-source3.diff text/plain 7195 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2ODZhMjEzLi5kNjk5ZWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMzQg QEAKIDIwMTItMTItMzEgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtXSzJdIFJlbmFtZSBTZXRGcmFtZUluVmlld1NvdXJjZU1vZGUgdG8gU2V0 TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA1ODg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyB3YXkgd2UgZG9uJ3QgZGVwZW5kIG9uIGEgV2ViRnJhbWVQ cm94eSBhbmQKKyAgICAgICAgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUoKSB3b3JrcyBl dmVuIGlmIHRoZSBtYWluIGZyYW1lIHByb3h5CisgICAgICAgIGhhc24ndCBiZWVuIGNyZWF0ZWQg eWV0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHA6Cisg ICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfc2V0X3ZpZXdfbW9kZSk6IENhbGwKKyAgICAgICAgV2Vi UGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKCkgZGlyZWN0bHkuCisgICAg ICAgICogVUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJG cmFtZVByb3h5OjpXZWJGcmFtZVByb3h5KTogUmVtb3ZlCisgICAgICAgIHNldEluVmlld1NvdXJj ZU1vZGUoKS4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5oOgorICAgICAgICAo V2ViRnJhbWVQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9k ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViUGFn ZVByb3h5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUpOgorICAg ICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgIChXZWJQYWdlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKworMjAx Mi0xMi0zMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAg ICAgICAgW0dUS10gQWRkIEFQSSB0byBzZXQgYSBXZWJLaXRXZWJWaWV3IGluIHZpZXcgc291cmNl IG1vZGUgdG8gV2ViS2l0MgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTkzMTUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0 ay9XZWJLaXRXZWJWaWV3LmNwcAppbmRleCA2YTRlNjRlLi5kMGVjOGM5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3LmNwcApAQCAtMjg5 OCwxMSArMjg5OCw3IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF92aWV3X21vZGUoV2ViS2l0 V2ViVmlldyogd2ViVmlldywgV2ViS2l0Vmlld01vZGUgdmlld01vCiAgICAgaWYgKHdlYlZpZXct PnByaXYtPnZpZXdNb2RlID09IHZpZXdNb2RlKQogICAgICAgICByZXR1cm47CiAKLSAgICBXZWJG cmFtZVByb3h5KiBmcmFtZSA9IGdldFBhZ2Uod2ViVmlldyktPm1haW5GcmFtZSgpOwotICAgIGlm ICghZnJhbWUpCi0gICAgICAgIHJldHVybjsKLQotICAgIGZyYW1lLT5zZXRJblZpZXdTb3VyY2VN b2RlKHZpZXdNb2RlID09IFdFQktJVF9WSUVXX01PREVfU09VUkNFKTsKKyAgICBnZXRQYWdlKHdl YlZpZXcpLT5zZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKHZpZXdNb2RlID09IFdFQktJVF9W SUVXX01PREVfU09VUkNFKTsKIAogICAgIHdlYlZpZXctPnByaXYtPnZpZXdNb2RlID0gdmlld01v ZGU7CiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JKRUNUKHdlYlZpZXcpLCAidmlldy1tb2RlIik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5kZXggZmIzNGFi Ny4uZjYwZmFiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkZyYW1l UHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5LmNw cApAQCAtNTEsNyArNTEsNiBAQCBXZWJGcmFtZVByb3h5OjpXZWJGcmFtZVByb3h5KFdlYlBhZ2VQ cm94eSogcGFnZSwgdWludDY0X3QgZnJhbWVJRCkKICAgICAsIG1fbGFzdENoaWxkKDApCiAgICAg LCBtX2xvYWRTdGF0ZShMb2FkU3RhdGVGaW5pc2hlZCkKICAgICAsIG1faXNGcmFtZVNldChmYWxz ZSkKLSAgICAsIG1faW5WaWV3U291cmNlTW9kZShmYWxzZSkKICAgICAsIG1fZnJhbWVJRChmcmFt ZUlEKQogewogICAgIFdlYkNvbnRleHQ6OnN0YXRpc3RpY3MoKS53a0ZyYW1lQ291bnQrKzsKQEAg LTEzOCwxNSArMTM3LDYgQEAgYm9vbCBXZWJGcmFtZVByb3h5Ojppc0Rpc3BsYXlpbmdQREZEb2N1 bWVudCgpIGNvbnN0CiAgICAgcmV0dXJuIFdlYkNvbnRleHQ6OnBkZkFuZFBvc3RTY3JpcHRNSU1F VHlwZXMoKS5jb250YWlucyhtX01JTUVUeXBlKTsKIH0KIAotdm9pZCBXZWJGcmFtZVByb3h5Ojpz ZXRJblZpZXdTb3VyY2VNb2RlKGJvb2wgbW9kZSkKLXsKLSAgICBpZiAobV9pblZpZXdTb3VyY2VN b2RlID09IG1vZGUpCi0gICAgICAgIHJldHVybjsKLQotICAgIG1faW5WaWV3U291cmNlTW9kZSA9 IG1vZGU7Ci0gICAgbV9wYWdlLT5zZXRGcmFtZUluVmlld1NvdXJjZU1vZGUodGhpcywgbV9pblZp ZXdTb3VyY2VNb2RlKTsKLX0KLQogdm9pZCBXZWJGcmFtZVByb3h5OjpkaWRTdGFydFByb3Zpc2lv bmFsTG9hZChjb25zdCBTdHJpbmcmIHVybCkKIHsKICAgICBBU1NFUlQobV9sb2FkU3RhdGUgPT0g TG9hZFN0YXRlRmluaXNoZWQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYkZyYW1lUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJGcmFtZVByb3h5 LmgKaW5kZXggMjBjY2MzMi4uZGU1YTU4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYkZyYW1lUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5oCkBAIC0xMDgsOSArMTA4LDYgQEAgcHVibGljOgogICAgIGJvb2wgaXNEaXNw bGF5aW5nTWFya3VwRG9jdW1lbnQoKSBjb25zdDsKICAgICBib29sIGlzRGlzcGxheWluZ1BERkRv Y3VtZW50KCkgY29uc3Q7CiAKLSAgICBib29sIGluVmlld1NvdXJjZU1vZGUoKSBjb25zdCB7IHJl dHVybiBtX2luVmlld1NvdXJjZU1vZGU7IH0KLSAgICB2b2lkIHNldEluVmlld1NvdXJjZU1vZGUo Ym9vbCk7Ci0KICAgICB2b2lkIGdldFdlYkFyY2hpdmUoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+ KTsKICAgICB2b2lkIGdldE1haW5SZXNvdXJjZURhdGEoUGFzc1JlZlB0cjxEYXRhQ2FsbGJhY2s+ KTsKICAgICB2b2lkIGdldFJlc291cmNlRGF0YShXZWJVUkwqLCBQYXNzUmVmUHRyPERhdGFDYWxs YmFjaz4pOwpAQCAtMTU3LDcgKzE1NCw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5nIG1fTUlNRVR5 cGU7CiAgICAgU3RyaW5nIG1fdGl0bGU7CiAgICAgYm9vbCBtX2lzRnJhbWVTZXQ7Ci0gICAgYm9v bCBtX2luVmlld1NvdXJjZU1vZGU7CiAgICAgUmVmUHRyPFdlYkNlcnRpZmljYXRlSW5mbz4gbV9j ZXJ0aWZpY2F0ZUluZm87CiAgICAgUmVmUHRyPFdlYkZyYW1lTGlzdGVuZXJQcm94eT4gbV9hY3Rp dmVMaXN0ZW5lcjsKICAgICB1aW50NjRfdCBtX2ZyYW1lSUQ7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDdjOTMzOTIuLjk1NmJmMDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC00MjU3LDkgKzQyNTcsOSBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6Y2FuY2VsQ29tcG9zaXRpb24oKQogfQogI2VuZGlmIC8vIFBMQVRG T1JNKFFUKSB8fCBQTEFURk9STShHVEspCiAKLXZvaWQgV2ViUGFnZVByb3h5OjpzZXRGcmFtZUlu Vmlld1NvdXJjZU1vZGUoV2ViRnJhbWVQcm94eSogZnJhbWUsIGJvb2wgaW5WaWV3U291cmNlTW9k ZSkKK3ZvaWQgV2ViUGFnZVByb3h5OjpzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wg aW5WaWV3U291cmNlTW9kZSkKIHsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OlNldEZyYW1lSW5WaWV3U291cmNlTW9kZShmcmFtZS0+ZnJhbWVJRCgpLCBpblZpZXdTb3Vy Y2VNb2RlKSwgbV9wYWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6U2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShpblZpZXdTb3VyY2VNb2RlKSwgbV9wYWdl SUQpOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAppbmRleCBiOGEwYjY3Li4xMjhkNzVhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC03NzIsNyArNzcyLDcgQEAgcHVibGljOgogICAgIGRv dWJsZSBtaW5pbXVtTGF5b3V0V2lkdGgoKSBjb25zdCB7IHJldHVybiBtX21pbmltdW1MYXlvdXRX aWR0aDsgfQogICAgIHZvaWQgc2V0TWluaW11bUxheW91dFdpZHRoKGRvdWJsZSk7CiAKLSAgICB2 b2lkIHNldEZyYW1lSW5WaWV3U291cmNlTW9kZShXZWJGcmFtZVByb3h5KiwgYm9vbCBpblZpZXdT b3VyY2VNb2RlKTsKKyAgICB2b2lkIHNldE1haW5GcmFtZUluVmlld1NvdXJjZU1vZGUoYm9vbCk7 CiAKIHByaXZhdGU6CiAgICAgV2ViUGFnZVByb3h5KFBhZ2VDbGllbnQqLCBQYXNzUmVmUHRyPFdl YlByb2Nlc3NQcm94eT4sIFdlYlBhZ2VHcm91cCosIHVpbnQ2NF90IHBhZ2VJRCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMGMyZDg0Zi4u OTE4ZTEyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcApAQCAtMzc2MywxMCArMzc2Myw5IEBAIHZvaWQgV2ViUGFnZTo6Y2FuY2VsQ29tcG9zaXRp b24oRWRpdG9yU3RhdGUmIG5ld1N0YXRlKQogfQogI2VuZGlmCiAKLXZvaWQgV2ViUGFnZTo6c2V0 RnJhbWVJblZpZXdTb3VyY2VNb2RlKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaW5WaWV3U291cmNl TW9kZSkKK3ZvaWQgV2ViUGFnZTo6c2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShib29sIGlu Vmlld1NvdXJjZU1vZGUpCiB7Ci0gICAgaWYgKFdlYkZyYW1lKiBmcmFtZSA9IFdlYlByb2Nlc3M6 OnNoYXJlZCgpLndlYkZyYW1lKGZyYW1lSUQpKQotICAgICAgICBmcmFtZS0+Y29yZUZyYW1lKCkt PnNldEluVmlld1NvdXJjZU1vZGUoaW5WaWV3U291cmNlTW9kZSk7CisgICAgbV9tYWluRnJhbWUt PmNvcmVGcmFtZSgpLT5zZXRJblZpZXdTb3VyY2VNb2RlKGluVmlld1NvdXJjZU1vZGUpOwogfQog CiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5oCmluZGV4IDMwMjViOTIuLjk4MTVlMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNzkxLDcgKzc5MSw3IEBAIHByaXZhdGU6 CiAKICAgICBib29sIGNhbkhhbmRsZVVzZXJFdmVudHMoKSBjb25zdDsKIAotICAgIHZvaWQgc2V0 RnJhbWVJblZpZXdTb3VyY2VNb2RlKHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wgaW5WaWV3U291cmNl TW9kZSk7CisgICAgdm9pZCBzZXRNYWluRnJhbWVJblZpZXdTb3VyY2VNb2RlKGJvb2wpOwogCiAg ICAgc3RhdGljIGJvb2wgcGxhdGZvcm1DYW5IYW5kbGVSZXF1ZXN0KGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluCmluZGV4IDVhM2ZhOTAuLjc0ZTVmY2YgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2Vz LmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3Nh Z2VzLmluCkBAIC0zMTUsNSArMzE1LDUgQEAgbWVzc2FnZXMgLT4gV2ViUGFnZSB7CiAgICAgU2V0 QWNjZWxlcmF0ZWRDb21wb3NpdGluZ1dpbmRvd0lkKGludDY0X3QgaWQpCiAjZW5kaWYKIAotICAg IFNldEZyYW1lSW5WaWV3U291cmNlTW9kZSh1aW50NjRfdCBmcmFtZUlELCBib29sIGluVmlld1Nv dXJjZU1vZGUpCisgICAgU2V0TWFpbkZyYW1lSW5WaWV3U291cmNlTW9kZShib29sIGluVmlld1Nv dXJjZU1vZGUpCiB9Cg==