66568 2011-08-19 10:31:41 -0700 Expose Fixed Layout Size mode to Chromium's WebKit API 2011-08-19 13:37:35 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 fsamuel fsamuel fishd fsamuel rjkroege webkit.review.bot oldest_to_newest 453913 0 fsamuel 2011-08-19 10:31:41 -0700 Expose Fixed Layout Size mode to Chromium's WebKit API 453914 1 104523 fsamuel 2011-08-19 10:32:36 -0700 Created attachment 104523 Patch 453919 2 104523 fishd 2011-08-19 10:42:53 -0700 Comment on attachment 104523 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104523&action=review > Source/WebKit/chromium/public/WebView.h:220 > + // Gets the fixed layout size. this comment and the one for setFixedLayoutSize seem redundant with the name of the methods. i'd just leave out the comments. same goes for the functions that control whether or not this mode is enabled. the comment could use a little bit of help too, and here's a stab at how i might revise this part: // Fixed Layout -------------------------------------------------------- // In fixed layout mode, the layout of the page is independent of the // view port size, given by WebWidget::size(). virtual bool isFixedLayoutModeEnabled() const = 0; virtual void enableFixedLayoutMode(bool enable) = 0; virtual WebSize fixedLayoutSize() const = 0; virtual void setFixedLayoutSize(const WebSize&) = 0; > Source/WebKit/chromium/public/WebView.h:227 > + virtual bool useFixedLayout() const = 0; nit: there is a convention for enable methods like these: virtual bool isFixedLayoutModeEnabled() const = 0; virtual void enableFixedLayoutMode(bool enable) = 0; > Source/WebKit/chromium/src/WebViewImpl.cpp:1868 > + return WebSize(0, 0); nit: just use the default constructor for WebSize. "return WebSize();" > Source/WebKit/chromium/src/WebViewImpl.cpp:1872 > + return WebSize(0, 0); ditto > Source/WebKit/chromium/src/WebViewImpl.cpp:1874 > + return frame->view()->fixedLayoutSize(); given that this is a control on the FrameView, perhaps these methods should really be on WebFrame instead of WebView? is it meaningful to only set fixed layout size on a subframe? 453923 3 fsamuel 2011-08-19 10:46:38 -0700 (In reply to comment #2) > (From update of attachment 104523 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=104523&action=review > > > Source/WebKit/chromium/public/WebView.h:220 > > + // Gets the fixed layout size. > > this comment and the one for setFixedLayoutSize seem redundant with the name > of the methods. i'd just leave out the comments. > > same goes for the functions that control whether or not this mode is enabled. > > the comment could use a little bit of help too, and here's a stab at how i > might revise this part: > > // Fixed Layout -------------------------------------------------------- > > // In fixed layout mode, the layout of the page is independent of the > // view port size, given by WebWidget::size(). > > virtual bool isFixedLayoutModeEnabled() const = 0; > virtual void enableFixedLayoutMode(bool enable) = 0; > > virtual WebSize fixedLayoutSize() const = 0; > virtual void setFixedLayoutSize(const WebSize&) = 0; > > > Source/WebKit/chromium/public/WebView.h:227 > > + virtual bool useFixedLayout() const = 0; > > nit: there is a convention for enable methods like these: > > virtual bool isFixedLayoutModeEnabled() const = 0; > virtual void enableFixedLayoutMode(bool enable) = 0; > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1868 > > + return WebSize(0, 0); > > nit: just use the default constructor for WebSize. "return WebSize();" > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1872 > > + return WebSize(0, 0); > > ditto > > > Source/WebKit/chromium/src/WebViewImpl.cpp:1874 > > + return frame->view()->fixedLayoutSize(); > > given that this is a control on the FrameView, perhaps these methods > should really be on WebFrame instead of WebView? is it meaningful to > only set fixed layout size on a subframe? I will make all the changes you suggested. I don't believe it's meaningful to set the fixed layout size on a subframe at this point in time (I can't think of reasonable use case at the moment). So should I leave it in WebView? 453945 4 104534 fsamuel 2011-08-19 11:33:45 -0700 Created attachment 104534 Patch 453949 5 104534 fishd 2011-08-19 11:35:47 -0700 Comment on attachment 104534 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104534&action=review > Source/WebKit/chromium/public/WebView.h:214 > nit: add one more new line here to preserve the rule that there should be two new lines between sections. 453954 6 104537 fsamuel 2011-08-19 11:41:31 -0700 Created attachment 104537 Patch 454036 7 104537 webkit.review.bot 2011-08-19 13:37:31 -0700 Comment on attachment 104537 Patch Clearing flags on attachment: 104537 Committed r93434: <http://trac.webkit.org/changeset/93434> 454037 8 webkit.review.bot 2011-08-19 13:37:35 -0700 All reviewed patches have been landed. Closing bug. 104523 2011-08-19 10:32:36 -0700 2011-08-19 11:33:40 -0700 Patch bug-66568-20110819133234.patch text/plain 4403 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NDU5Y2JkOGYxMjY3Y2VhZWRiNGVhOTljODZhMTA0MDgzNTBhZGQ3OC4uNWRkYmMyOGQ1MmM3NWU0 NGQ4YzNiMzFmNWQ1ZmYzMDljOTk4N2MxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMS0wOC0xOSAgRmFkeSBTYW11ZWwgIDxmc2FtdWVsQGNocm9taXVt Lm9yZz4KKworICAgICAgICBFeHBvc2UgRml4ZWQgTGF5b3V0IFNpemUgbW9kZSB0byBDaHJvbWl1 bSdzIFdlYktpdCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2NTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjpmaXhlZExheW91dFNpemUpOgorICAgICAg ICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2V0Rml4ZWRMYXlvdXRTaXplKToKKyAgICAgICAgKFdl YktpdDo6V2ViVmlld0ltcGw6OnVzZUZpeGVkTGF5b3V0KToKKyAgICAgICAgKFdlYktpdDo6V2Vi Vmlld0ltcGw6OnNldFVzZUZpeGVkTGF5b3V0KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwu aDoKKwogMjAxMS0wOC0xOSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNpb25zIEFQSV1bY2hyb21pdW1dIHdlYklu c3BlY3Rvci5yZXNvdXJjZXMgZGVwcmVjYXRpb24gd2FybmluZyBpcyBnaXZlbiBldmVuIGZvciBl eHRlbnNpb25zIHRoYXQgZG9uJ3QgdXNlIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaCBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vcHVibGljL1dlYlZpZXcuaAppbmRleCA4OWMxMzI1MzhiM2Q4MGE1NjQ2ZDVh YzQ5ZGIwMmNkMWQ1NzVmNTVkLi5lNDQ1MjNmNzIyNzg1NzZiNWI1NGNjMWQxNjE5M2NkODg2MzQ4 ZTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3LmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCkBAIC0yMTIsNiAr MjEyLDIwIEBAIHB1YmxpYzoKICAgICAvLyBPbiB0aGUgb3RoZXIgaGFuZCwgem9vbWluZyBhZmZl Y3RzIGxheW91dCBvZiB0aGUgcGFnZS4KICAgICB2aXJ0dWFsIHZvaWQgc2NhbGVQYWdlKGZsb2F0 IHNjYWxlRmFjdG9yLCBXZWJQb2ludCBvcmlnaW4pID0gMDsKIAorICAgIC8vIEZpeGVkIExheW91 dCAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LQorCisgICAgLy8gRml4ZWQgTGF5b3V0IE1vZGU6IGlmIHNldCB0aGUgbGF5b3V0IHNpemUgb2Yg dGhlIHBhZ2UgaXMgaW5kZXBlbmRlbnQKKyAgICAvLyBvZiB0aGUgRnJhbWVWaWV3J3Mgc2l6ZS4K KworICAgIC8vIEdldHMgdGhlIGZpeGVkIGxheW91dCBzaXplLgorICAgIHZpcnR1YWwgV2ViU2l6 ZSBmaXhlZExheW91dFNpemUoKSBjb25zdCA9IDA7CisKKyAgICAvLyBTZXRzIHRoZSBmaXhlZCBs YXlvdXQgc2l6ZS4KKyAgICB2aXJ0dWFsIHZvaWQgc2V0Rml4ZWRMYXlvdXRTaXplKGNvbnN0IFdl YlNpemUmKSA9IDA7CisKKyAgICAvLyBHZXR0ZXJzIGFuZCBzZXR0ZXJzIGZvciBxdWVyeWluZyBh bmQgZW5hYmxpbmcgZml4ZWQgbGF5b3V0IG1vZGUuCisgICAgdmlydHVhbCBib29sIHVzZUZpeGVk TGF5b3V0KCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzZXRVc2VGaXhlZExheW91dChi b29sIGVuYWJsZSkgPSAwOwogCiAgICAgLy8gTWVkaWEgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAppbmRleCA4MDExNWRkNjhhNTU4MmE4N2RjNzMy MmUyMTRlOTFmMDhhNzdiN2NlLi4wYTczMTE1OTg1YmYxOTYwNjBmMTJlMDVjODJhZjU0Y2Y5Yjdh ZjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5j cHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCkBAIC0x ODYyLDYgKzE4NjIsNTQgQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2NhbGVQYWdlKGZsb2F0IHNjYWxl RmFjdG9yLCBXZWJQb2ludCBvcmlnaW4pCiAgICAgZnJhbWUtPnNjYWxlUGFnZShzY2FsZUZhY3Rv ciwgb3JpZ2luKTsKIH0KIAorV2ViU2l6ZSBXZWJWaWV3SW1wbDo6Zml4ZWRMYXlvdXRTaXplKCkg Y29uc3QKK3sKKyAgICBpZiAoIXBhZ2UoKSkKKyAgICAgICAgcmV0dXJuIFdlYlNpemUoMCwgMCk7 CisKKyAgICBGcmFtZSogZnJhbWUgPSBwYWdlKCktPm1haW5GcmFtZSgpOworICAgIGlmICghZnJh bWUpCisgICAgICAgIHJldHVybiBXZWJTaXplKDAsIDApOworCisgICAgcmV0dXJuIGZyYW1lLT52 aWV3KCktPmZpeGVkTGF5b3V0U2l6ZSgpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjpzZXRGaXhl ZExheW91dFNpemUoY29uc3QgV2ViU2l6ZSYgbGF5b3V0U2l6ZSkKK3sKKyAgICBpZiAoIXBhZ2Uo KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgRnJhbWUqIGZyYW1lID0gcGFnZSgpLT5tYWluRnJh bWUoKTsKKyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm47CisKKyAgICBmcmFtZS0+dmll dygpLT5zZXRGaXhlZExheW91dFNpemUobGF5b3V0U2l6ZSk7Cit9CisKK2Jvb2wgV2ViVmlld0lt cGw6OnVzZUZpeGVkTGF5b3V0KCkgY29uc3QKK3sKKyAgICBpZiAoIXBhZ2UoKSkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworCisgICAgRnJhbWUqIGZyYW1lID0gcGFnZSgpLT5tYWluRnJhbWUoKTsK KyAgICBpZiAoIWZyYW1lKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gZnJh bWUtPnZpZXcoKS0+dXNlRml4ZWRMYXlvdXQoKTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6c2V0 VXNlRml4ZWRMYXlvdXQoYm9vbCBlbmFibGUpCit7CisgICAgaWYgKCFwYWdlKCkpCisgICAgICAg IHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAg aWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZnJhbWUtPnZpZXcoKS0+c2V0VXNl Rml4ZWRMYXlvdXQoZW5hYmxlKTsKK30KKwogdm9pZCBXZWJWaWV3SW1wbDo6cGVyZm9ybU1lZGlh UGxheWVyQWN0aW9uKGNvbnN0IFdlYk1lZGlhUGxheWVyQWN0aW9uJiBhY3Rpb24sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGxvY2F0 aW9uKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0lt cGwuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKaW5kZXggYzRi NmM2YTA1OGQyYWVlYzMyYTBmN2FjMjY0NzBkM2JhZGQ2ZjdlMi4uOWZkNjAyOWM5YjdiYTNlMDY2 N2MwMjRjMmQzNjMzYWIzZjg0NTM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9zcmMvV2ViVmlld0ltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJW aWV3SW1wbC5oCkBAIC0xNTcsNiArMTU3LDEwIEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZG91YmxlIG1heGltdW1ab29tTGV2ZWwpOwogICAgIHZpcnR1YWwg ZmxvYXQgcGFnZVNjYWxlRmFjdG9yKCkgY29uc3Q7CiAgICAgdmlydHVhbCB2b2lkIHNjYWxlUGFn ZShmbG9hdCBzY2FsZUZhY3RvciwgV2ViUG9pbnQgb3JpZ2luKTsKKyAgICB2aXJ0dWFsIFdlYlNp emUgZml4ZWRMYXlvdXRTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHNldEZpeGVkTGF5 b3V0U2l6ZShjb25zdCBXZWJTaXplJik7CisgICAgdmlydHVhbCBib29sIHVzZUZpeGVkTGF5b3V0 KCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIHNldFVzZUZpeGVkTGF5b3V0KGJvb2wgZW5hYmxl KTsKICAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybU1lZGlhUGxheWVyQWN0aW9uKAogICAgICAgICBj b25zdCBXZWJNZWRpYVBsYXllckFjdGlvbiYgYWN0aW9uLAogICAgICAgICBjb25zdCBXZWJQb2lu dCYgbG9jYXRpb24pOwo= 104534 2011-08-19 11:33:45 -0700 2011-08-19 11:41:26 -0700 Patch bug-66568-20110819143343.patch text/plain 4323 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NDU5Y2JkOGYxMjY3Y2VhZWRiNGVhOTljODZhMTA0MDgzNTBhZGQ3OC4uMDU0YTg0NDViNDlhYjMy NTE4YTk0ODdjM2M1YzliNjQ4MDgyMzBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMS0wOC0xOSAgRmFkeSBTYW11ZWwgIDxmc2FtdWVsQGNocm9taXVt Lm9yZz4KKworICAgICAgICBFeHBvc2UgRml4ZWQgTGF5b3V0IFNpemUgbW9kZSB0byBDaHJvbWl1 bSdzIFdlYktpdCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2NTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjppc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZW5hYmxlRml4ZWRMYXlvdXRNb2RlKToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmZpeGVkTGF5b3V0U2l6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRGaXhlZExheW91dFNpemUpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5oOgorCiAyMDExLTA4LTE5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4dGVuc2lvbnMgQVBJXVtj aHJvbWl1bV0gd2ViSW5zcGVjdG9yLnJlc291cmNlcyBkZXByZWNhdGlvbiB3YXJuaW5nIGlzIGdp dmVuIGV2ZW4gZm9yIGV4dGVuc2lvbnMgdGhhdCBkb24ndCB1c2Ugd2ViSW5zcGVjdG9yLnJlc291 cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IDg5YzEzMjUz OGIzZDgwYTU2NDZkNWFjNDlkYjAyY2QxZDU3NWY1NWQuLjlhMzZhZWFmY2ExYTdiYTU0ZGJhOWM5 NWNiNzhlMWM4YjU0NTNjMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3 LmgKQEAgLTIxMiw2ICsyMTIsMTcgQEAgcHVibGljOgogICAgIC8vIE9uIHRoZSBvdGhlciBoYW5k LCB6b29taW5nIGFmZmVjdHMgbGF5b3V0IG9mIHRoZSBwYWdlLgogICAgIHZpcnR1YWwgdm9pZCBz Y2FsZVBhZ2UoZmxvYXQgc2NhbGVGYWN0b3IsIFdlYlBvaW50IG9yaWdpbikgPSAwOwogCisgICAg Ly8gRml4ZWQgTGF5b3V0IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tCisKKyAgICAvLyBJbiBmaXhlZCBsYXlvdXQgbW9kZSwgdGhlIGxheW91 dCBvZiB0aGUgcGFnZSBpcyBpbmRlcGVuZGVudCBvZiB0aGUKKyAgICAvLyB2aWV3IHBvcnQgc2l6 ZSwgZ2l2ZW4gYnkgV2ViV2lkZ2V0OjpzaXplKCkuCisKKyAgICB2aXJ0dWFsIGJvb2wgaXNGaXhl ZExheW91dE1vZGVFbmFibGVkKCkgY29uc3QgPSAwOworICAgIHZpcnR1YWwgdm9pZCBlbmFibGVG aXhlZExheW91dE1vZGUoYm9vbCBlbmFibGUpID0gMDsKKworICAgIHZpcnR1YWwgV2ViU2l6ZSBm aXhlZExheW91dFNpemUoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIHNldEZpeGVkTGF5 b3V0U2l6ZShjb25zdCBXZWJTaXplJikgPSAwOworCiAKICAgICAvLyBNZWRpYSAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmluZGV4IDgwMTE1ZGQ2 OGE1NTgyYTg3ZGM3MzIyZTIxNGU5MWYwOGE3N2I3Y2UuLjdiMmI0ZTQxOWNlMDA1NmNhY2VmNmIz N2VkNGQ2MmY1N2NkMzU2ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3Jj L1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3 SW1wbC5jcHAKQEAgLTE4NjIsNiArMTg2Miw1NCBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzY2FsZVBh Z2UoZmxvYXQgc2NhbGVGYWN0b3IsIFdlYlBvaW50IG9yaWdpbikKICAgICBmcmFtZS0+c2NhbGVQ YWdlKHNjYWxlRmFjdG9yLCBvcmlnaW4pOwogfQogCitib29sIFdlYlZpZXdJbXBsOjppc0ZpeGVk TGF5b3V0TW9kZUVuYWJsZWQoKSBjb25zdAoreworICAgIGlmICghcGFnZSgpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKKyAgICBGcmFtZSogZnJhbWUgPSBwYWdlKCktPm1haW5GcmFtZSgpOwor ICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBmcmFt ZS0+dmlldygpLT51c2VGaXhlZExheW91dCgpOworfQorCit2b2lkIFdlYlZpZXdJbXBsOjplbmFi bGVGaXhlZExheW91dE1vZGUoYm9vbCBlbmFibGUpCit7CisgICAgaWYgKCFwYWdlKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFpbkZyYW1lKCk7Cisg ICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZnJhbWUtPnZpZXcoKS0+c2V0 VXNlRml4ZWRMYXlvdXQoZW5hYmxlKTsKK30KKworV2ViU2l6ZSBXZWJWaWV3SW1wbDo6Zml4ZWRM YXlvdXRTaXplKCkgY29uc3QKK3sKKyAgICBpZiAoIXBhZ2UoKSkKKyAgICAgICAgcmV0dXJuIFdl YlNpemUoKTsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAg aWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuIFdlYlNpemUoKTsKKworICAgIHJldHVybiBmcmFt ZS0+dmlldygpLT5maXhlZExheW91dFNpemUoKTsKK30KKwordm9pZCBXZWJWaWV3SW1wbDo6c2V0 Rml4ZWRMYXlvdXRTaXplKGNvbnN0IFdlYlNpemUmIGxheW91dFNpemUpCit7CisgICAgaWYgKCFw YWdlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFp bkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZnJhbWUt PnZpZXcoKS0+c2V0Rml4ZWRMYXlvdXRTaXplKGxheW91dFNpemUpOworfQorCiB2b2lkIFdlYlZp ZXdJbXBsOjpwZXJmb3JtTWVkaWFQbGF5ZXJBY3Rpb24oY29uc3QgV2ViTWVkaWFQbGF5ZXJBY3Rp b24mIGFjdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBXZWJQb2ludCYgbG9jYXRpb24pCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2Vi Vmlld0ltcGwuaAppbmRleCBjNGI2YzZhMDU4ZDJhZWVjMzJhMGY3YWMyNjQ3MGQzYmFkZDZmN2Uy Li5jN2NkMTJiNjcwNGRjOTU2MjA0YjEwNDc1MzZjYmRhMWJiMTY2NDljIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTE1Nyw2ICsxNTcsMTAgQEAgcHVibGlj OgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUgbWF4aW11bVpvb21M ZXZlbCk7CiAgICAgdmlydHVhbCBmbG9hdCBwYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAgICB2 aXJ0dWFsIHZvaWQgc2NhbGVQYWdlKGZsb2F0IHNjYWxlRmFjdG9yLCBXZWJQb2ludCBvcmlnaW4p OworICAgIHZpcnR1YWwgYm9vbCBpc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQoKSBjb25zdDsKKyAg ICB2aXJ0dWFsIHZvaWQgZW5hYmxlRml4ZWRMYXlvdXRNb2RlKGJvb2wgZW5hYmxlKTsKKyAgICB2 aXJ0dWFsIFdlYlNpemUgZml4ZWRMYXlvdXRTaXplKCkgY29uc3Q7CisgICAgdmlydHVhbCB2b2lk IHNldEZpeGVkTGF5b3V0U2l6ZShjb25zdCBXZWJTaXplJik7CiAgICAgdmlydHVhbCB2b2lkIHBl cmZvcm1NZWRpYVBsYXllckFjdGlvbigKICAgICAgICAgY29uc3QgV2ViTWVkaWFQbGF5ZXJBY3Rp b24mIGFjdGlvbiwKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGxvY2F0aW9uKTsK 104537 2011-08-19 11:41:31 -0700 2011-08-19 13:37:31 -0700 Patch bug-66568-20110819144130.patch text/plain 4335 fsamuel U3VidmVyc2lvbiBSZXZpc2lvbjogOTM0MjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXgg NDU5Y2JkOGYxMjY3Y2VhZWRiNGVhOTljODZhMTA0MDgzNTBhZGQ3OC4uMDU0YTg0NDViNDlhYjMy NTE4YTk0ODdjM2M1YzliNjQ4MDgyMzBhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxOCBAQAorMjAxMS0wOC0xOSAgRmFkeSBTYW11ZWwgIDxmc2FtdWVsQGNocm9taXVt Lm9yZz4KKworICAgICAgICBFeHBvc2UgRml4ZWQgTGF5b3V0IFNpemUgbW9kZSB0byBDaHJvbWl1 bSdzIFdlYktpdCBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY2NTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwdWJsaWMvV2ViVmlldy5oOgorICAgICAgICAqIHNyYy9XZWJWaWV3SW1wbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlZpZXdJbXBsOjppc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQp OgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6ZW5hYmxlRml4ZWRMYXlvdXRNb2RlKToK KyAgICAgICAgKFdlYktpdDo6V2ViVmlld0ltcGw6OmZpeGVkTGF5b3V0U2l6ZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlZpZXdJbXBsOjpzZXRGaXhlZExheW91dFNpemUpOgorICAgICAgICAqIHNy Yy9XZWJWaWV3SW1wbC5oOgorCiAyMDExLTA4LTE5ICBBbmRyZXkgS29zeWFrb3YgIDxjYXNlcUBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4dGVuc2lvbnMgQVBJXVtj aHJvbWl1bV0gd2ViSW5zcGVjdG9yLnJlc291cmNlcyBkZXByZWNhdGlvbiB3YXJuaW5nIGlzIGdp dmVuIGV2ZW4gZm9yIGV4dGVuc2lvbnMgdGhhdCBkb24ndCB1c2Ugd2ViSW5zcGVjdG9yLnJlc291 cmNlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5o IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVmlldy5oCmluZGV4IDg5YzEzMjUz OGIzZDgwYTU2NDZkNWFjNDlkYjAyY2QxZDU3NWY1NWQuLjE3OTdkYzUxYTYyMTcwOTRjMTE5NTY2 MjRiMDc0ODIxZDlmNjUyZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJWaWV3 LmgKQEAgLTIxMyw2ICsyMTMsMTggQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzY2FsZVBh Z2UoZmxvYXQgc2NhbGVGYWN0b3IsIFdlYlBvaW50IG9yaWdpbikgPSAwOwogCiAKKyAgICAvLyBG aXhlZCBMYXlvdXQgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0KKworICAgIC8vIEluIGZpeGVkIGxheW91dCBtb2RlLCB0aGUgbGF5b3V0IG9m IHRoZSBwYWdlIGlzIGluZGVwZW5kZW50IG9mIHRoZQorICAgIC8vIHZpZXcgcG9ydCBzaXplLCBn aXZlbiBieSBXZWJXaWRnZXQ6OnNpemUoKS4KKworICAgIHZpcnR1YWwgYm9vbCBpc0ZpeGVkTGF5 b3V0TW9kZUVuYWJsZWQoKSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIGVuYWJsZUZpeGVk TGF5b3V0TW9kZShib29sIGVuYWJsZSkgPSAwOworCisgICAgdmlydHVhbCBXZWJTaXplIGZpeGVk TGF5b3V0U2l6ZSgpIGNvbnN0ID0gMDsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0Rml4ZWRMYXlvdXRT aXplKGNvbnN0IFdlYlNpemUmKSA9IDA7CisKKwogICAgIC8vIE1lZGlhIC0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCiAgICAg Ly8gUGVyZm9ybXMgdGhlIHNwZWNpZmllZCBhY3Rpb24gb24gdGhlIG5vZGUgYXQgdGhlIGdpdmVu IGxvY2F0aW9uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmll d0ltcGwuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3BwCmlu ZGV4IDgwMTE1ZGQ2OGE1NTgyYTg3ZGM3MzIyZTIxNGU5MWYwOGE3N2I3Y2UuLjdiMmI0ZTQxOWNl MDA1NmNhY2VmNmIzN2VkNGQ2MmY1N2NkMzU2ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJWaWV3SW1wbC5jcHAKQEAgLTE4NjIsNiArMTg2Miw1NCBAQCB2b2lkIFdlYlZpZXdJ bXBsOjpzY2FsZVBhZ2UoZmxvYXQgc2NhbGVGYWN0b3IsIFdlYlBvaW50IG9yaWdpbikKICAgICBm cmFtZS0+c2NhbGVQYWdlKHNjYWxlRmFjdG9yLCBvcmlnaW4pOwogfQogCitib29sIFdlYlZpZXdJ bXBsOjppc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQoKSBjb25zdAoreworICAgIGlmICghcGFnZSgp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBGcmFtZSogZnJhbWUgPSBwYWdlKCktPm1h aW5GcmFtZSgpOworICAgIGlmICghZnJhbWUpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAg IHJldHVybiBmcmFtZS0+dmlldygpLT51c2VGaXhlZExheW91dCgpOworfQorCit2b2lkIFdlYlZp ZXdJbXBsOjplbmFibGVGaXhlZExheW91dE1vZGUoYm9vbCBlbmFibGUpCit7CisgICAgaWYgKCFw YWdlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFp bkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgZnJhbWUt PnZpZXcoKS0+c2V0VXNlRml4ZWRMYXlvdXQoZW5hYmxlKTsKK30KKworV2ViU2l6ZSBXZWJWaWV3 SW1wbDo6Zml4ZWRMYXlvdXRTaXplKCkgY29uc3QKK3sKKyAgICBpZiAoIXBhZ2UoKSkKKyAgICAg ICAgcmV0dXJuIFdlYlNpemUoKTsKKworICAgIEZyYW1lKiBmcmFtZSA9IHBhZ2UoKS0+bWFpbkZy YW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuIFdlYlNpemUoKTsKKworICAg IHJldHVybiBmcmFtZS0+dmlldygpLT5maXhlZExheW91dFNpemUoKTsKK30KKwordm9pZCBXZWJW aWV3SW1wbDo6c2V0Rml4ZWRMYXlvdXRTaXplKGNvbnN0IFdlYlNpemUmIGxheW91dFNpemUpCit7 CisgICAgaWYgKCFwYWdlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lKiBmcmFtZSA9 IHBhZ2UoKS0+bWFpbkZyYW1lKCk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgZnJhbWUtPnZpZXcoKS0+c2V0Rml4ZWRMYXlvdXRTaXplKGxheW91dFNpemUpOworfQor CiB2b2lkIFdlYlZpZXdJbXBsOjpwZXJmb3JtTWVkaWFQbGF5ZXJBY3Rpb24oY29uc3QgV2ViTWVk aWFQbGF5ZXJBY3Rpb24mIGFjdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBXZWJQb2ludCYgbG9jYXRpb24pCiB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9zcmMvV2ViVmlld0ltcGwuaAppbmRleCBjNGI2YzZhMDU4ZDJhZWVjMzJhMGY3YWMyNjQ3 MGQzYmFkZDZmN2UyLi5jN2NkMTJiNjcwNGRjOTU2MjA0YjEwNDc1MzZjYmRhMWJiMTY2NDljIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5oCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBsLmgKQEAgLTE1Nyw2ICsxNTcs MTAgQEAgcHVibGljOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUg bWF4aW11bVpvb21MZXZlbCk7CiAgICAgdmlydHVhbCBmbG9hdCBwYWdlU2NhbGVGYWN0b3IoKSBj b25zdDsKICAgICB2aXJ0dWFsIHZvaWQgc2NhbGVQYWdlKGZsb2F0IHNjYWxlRmFjdG9yLCBXZWJQ b2ludCBvcmlnaW4pOworICAgIHZpcnR1YWwgYm9vbCBpc0ZpeGVkTGF5b3V0TW9kZUVuYWJsZWQo KSBjb25zdDsKKyAgICB2aXJ0dWFsIHZvaWQgZW5hYmxlRml4ZWRMYXlvdXRNb2RlKGJvb2wgZW5h YmxlKTsKKyAgICB2aXJ0dWFsIFdlYlNpemUgZml4ZWRMYXlvdXRTaXplKCkgY29uc3Q7CisgICAg dmlydHVhbCB2b2lkIHNldEZpeGVkTGF5b3V0U2l6ZShjb25zdCBXZWJTaXplJik7CiAgICAgdmly dHVhbCB2b2lkIHBlcmZvcm1NZWRpYVBsYXllckFjdGlvbigKICAgICAgICAgY29uc3QgV2ViTWVk aWFQbGF5ZXJBY3Rpb24mIGFjdGlvbiwKICAgICAgICAgY29uc3QgV2ViUG9pbnQmIGxvY2F0aW9u KTsK