26265 2009-06-08 17:48:52 -0700 add Android platform-specific files to WebCore/platform (part 8) 2009-06-10 12:20:02 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 1 feng feng oldest_to_newest 124853 0 feng 2009-06-08 17:48:52 -0700 This is a spin-off of bug 23296, patch part 8: + * platform/android/SystemTimeAndroid.cpp: Added. + * platform/android/TextBoundaries.cpp: Added. + * platform/android/TextBreakIteratorInternalICU.cpp: Added. + * platform/android/WidgetAndroid.cpp: Added. Original comments: (From update of attachment 30004 [review]) I'm surprised we have any time code in WebCore? Isn't that all down in WTF? Why does andriod need its own different ICU code? TextBoundaries.cpp? IntRect() is the same as 54 return IntRect(0, 0, 0, 0); Isn't there an easier way to get the FrameView than your manual crawl? r- for the nits and questions. 125007 1 31106 feng 2009-06-09 14:15:03 -0700 Created attachment 31106 patch set 1 125008 2 feng 2009-06-09 14:21:48 -0700 (In reply to comment #0) > This is a spin-off of bug 23296, patch part 8: > + * platform/android/SystemTimeAndroid.cpp: Added. > + * platform/android/TextBoundaries.cpp: Added. > + * platform/android/TextBreakIteratorInternalICU.cpp: Added. > + * platform/android/WidgetAndroid.cpp: Added. > > Original comments: > > (From update of attachment 30004 [review] [review]) > I'm surprised we have any time code in WebCore? Isn't that all down in WTF? > Time code seems necessary to link WebCore/history/PageCache.cpp, there is a similar file, WebCore/platform/win/SystemTimeWin.cpp. > Why does andriod need its own different ICU code? TextBoundaries.cpp? > You are right, these files should under platform/text, removed. Will add them in a separate CL. > IntRect() is the same as 54 return IntRect(0, 0, 0, 0); > > Isn't there an easier way to get the FrameView than your manual crawl? > Only function similar is Widget::root(), but not the exact same. ScrollView* Widget::root() const { const Widget* top = this; while (top->parent()) top = top->parent(); if (top->isFrameView()) return const_cast<ScrollView*>(static_cast<const ScrollView*>(top)); return 0; } root() directly goes to the root Widget, but in screenWidth(), it searches the first FrameView ancestor. I don't know if it is possible to have a non-FrameView ancestor that's not a root, but both code are different. (it will be great if that's true). > r- for the nits and questions. > 125098 3 31106 eric 2009-06-10 00:25:14 -0700 Comment on attachment 31106 patch set 1 This probably should have a notImplemented() call: + // Needed for PageCache, which we currently have disabled. + return 0.0F; I'm also surprised to see an F there instead of an 'f'. I didn't even know F was valid. + // FIXME: use m_frame instead? + if (!platformWidget()) + return IntRect(0, 0, 0, 0); IntRect() is the same Looks fine. Please fix those nits when landing. 125193 4 bfulgham 2009-06-10 12:20:02 -0700 Landed in @r44586. 31106 2009-06-09 14:15:03 -0700 2009-06-10 00:25:14 -0700 patch set 1 bug26265.txt text/plain 6102 feng SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NDU0NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDYtMDkgIEZlbmcgUWlhbiAgPGZlbmdAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBB bmRyb2lkIHBsYXRmb3JtIHNwZWNpZmljIGZpbGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0L29yZy9zaG93X2J1Zy5jZ2k/aWQ9MjYyNjUKKworICAgICAgICAqIHBsYXRmb3JtL2FuZHJv aWQvU3lzdGVtVGltZUFuZHJvaWQuY3BwOiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9hbmRy b2lkL1dpZGdldEFuZHJvaWQuY3BwOiBBZGRlZC4KKwogMjAwOS0wNi0wOSAgRGFyaW4gRmlzaGVy ICA8ZGFyaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZpeCBDaHJvbWl1bSBidWlsZCBidXN0 YWdlLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1N5c3RlbVRpbWVBbmRyb2lkLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2FuZHJvaWQvU3lzdGVtVGltZUFuZHJv aWQuY3BwCShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9hbmRyb2lkL1N5c3RlbVRp bWVBbmRyb2lkLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwzNyBAQAorLyoKKyAqIENvcHly aWdodCAyMDA3LCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0CisgKgorICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9s bG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAgKiBSZWRpc3RyaWJ1dGlvbnMgb2Yg c291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNl LCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgor ICogICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBh Ym92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5k IHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5k L29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgor ICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJR0hUIEhPTERFUlMgYGBB UyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJ TkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVS Q0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJF IERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01QVVRFUiwgSU5DLiBPUgor ICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lE RU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAo SU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElU VVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7 IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVP UlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElU WSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNs dWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJTeXN0ZW1UaW1lLmgiCisKK25hbWVzcGFjZSBXZWJD b3JlIHsKKworZmxvYXQgdXNlcklkbGVUaW1lKCkKK3sKKyAgICAvLyBOZWVkZWQgZm9yIFBhZ2VD YWNoZSwgd2hpY2ggd2UgY3VycmVudGx5IGhhdmUgZGlzYWJsZWQuCisgICAgcmV0dXJuIDAuMEY7 Cit9CisKK30gIC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2Fu ZHJvaWQvV2lkZ2V0QW5kcm9pZC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9h bmRyb2lkL1dpZGdldEFuZHJvaWQuY3BwCShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS9wbGF0Zm9y bS9hbmRyb2lkL1dpZGdldEFuZHJvaWQuY3BwCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDEyOCBA QAorLyoKKyAqIENvcHlyaWdodCAyMDA3LCBUaGUgQW5kcm9pZCBPcGVuIFNvdXJjZSBQcm9qZWN0 CisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jt cywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlk ZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAgKiBSZWRp c3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyLgorICogICogUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3Qg cmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRv Y3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0 cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBUSEUgQ09QWVJJ R0hUIEhPTERFUlMgYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1MgT1IgSU1QTElFRCBXQVJS QU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCisgKiBJTVBMSUVEIFdB UlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIK KyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBDT01Q VVRFUiwgSU5DLiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJF TUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNP RlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJXaWRnZXQuaCIKKworI2lu Y2x1ZGUgIkZvbnQuaCIKKyNpbmNsdWRlICJGcmFtZVZpZXcuaCIKKyNpbmNsdWRlICJHcmFwaGlj c0NvbnRleHQuaCIKKyNpbmNsdWRlICJOb3RJbXBsZW1lbnRlZC5oIgorI2luY2x1ZGUgIldlYkNv cmVGcmFtZUJyaWRnZS5oIgorI2luY2x1ZGUgIldlYkNvcmVWaWV3QnJpZGdlLmgiCisjaW5jbHVk ZSAiV2ViVmlld0NvcmUuaCIKKworbmFtZXNwYWNlIFdlYkNvcmUgeworCitXaWRnZXQ6OldpZGdl dChQbGF0Zm9ybVdpZGdldCB3aWRnZXQpCit7CisgICAgaW5pdCh3aWRnZXQpOworfQorCitXaWRn ZXQ6On5XaWRnZXQoKQoreworICAgIEFTU0VSVCghcGFyZW50KCkpOworICAgIHJlbGVhc2VQbGF0 Zm9ybVdpZGdldCgpOworfQorCitJbnRSZWN0IFdpZGdldDo6ZnJhbWVSZWN0KCkgY29uc3QKK3sK KyAgICAvLyBGSVhNRTogdXNlIG1fZnJhbWUgaW5zdGVhZD8KKyAgICBpZiAoIXBsYXRmb3JtV2lk Z2V0KCkpCisgICAgICAgIHJldHVybiBJbnRSZWN0KDAsIDAsIDAsIDApOworICAgIHJldHVybiBw bGF0Zm9ybVdpZGdldCgpLT5nZXRCb3VuZHMoKTsKK30KKwordm9pZCBXaWRnZXQ6OnNldEZvY3Vz KCkKK3sKKyAgICBub3RJbXBsZW1lbnRlZCgpOworfQorCit2b2lkIFdpZGdldDo6cGFpbnQoR3Jh cGhpY3NDb250ZXh0KiBjdHgsIGNvbnN0IEludFJlY3QmIHIpCit7CisgICAgLy8gRklYTUU6IGlu IHdoYXQgY2FzZSwgd2lsbCB0aGlzIGJlIGNhbGxlZCBmb3IgdGhlIHRvcCBmcmFtZT8KKyAgICBp ZiAoIXBsYXRmb3JtV2lkZ2V0KCkpCisgICAgICAgIHJldHVybjsKKyAgICBwbGF0Zm9ybVdpZGdl dCgpLT5kcmF3KGN0eCwgcik7Cit9CisKK3ZvaWQgV2lkZ2V0OjpyZWxlYXNlUGxhdGZvcm1XaWRn ZXQoKQoreworICAgIFJlbGVhc2UocGxhdGZvcm1XaWRnZXQoKSk7Cit9CisKK3ZvaWQgV2lkZ2V0 OjpyZXRhaW5QbGF0Zm9ybVdpZGdldCgpCit7CisgICAgUmV0YWluKHBsYXRmb3JtV2lkZ2V0KCkp OworfQorCit2b2lkIFdpZGdldDo6c2V0Q3Vyc29yKGNvbnN0IEN1cnNvciYgY3Vyc29yKQorewor ICAgIG5vdEltcGxlbWVudGVkKCk7Cit9CisKK3ZvaWQgV2lkZ2V0OjpzaG93KCkKK3sKKyAgICBu b3RJbXBsZW1lbnRlZCgpOyAKK30KKwordm9pZCBXaWRnZXQ6OmhpZGUoKQoreworICAgIG5vdElt cGxlbWVudGVkKCk7IAorfQorCit2b2lkIFdpZGdldDo6c2V0RnJhbWVSZWN0KGNvbnN0IEludFJl Y3QmIHJlY3QpCit7CisgICAgLy8gRklYTUU6IHNldCBtX2ZyYW1lIGluc3RlYWQ/CisgICAgLy8g cGxhdGZvcm1XaWRnZXQoKSBpcyBOVUxMIHdoZW4gY2FsbGVkIGZyb20gU2Nyb2xsYmFyCisgICAg aWYgKCFwbGF0Zm9ybVdpZGdldCgpKQorICAgICAgICByZXR1cm47CisgICAgcGxhdGZvcm1XaWRn ZXQoKS0+c2V0TG9jYXRpb24ocmVjdC54KCksIHJlY3QueSgpKTsKKyAgICBwbGF0Zm9ybVdpZGdl dCgpLT5zZXRTaXplKHJlY3Qud2lkdGgoKSwgcmVjdC5oZWlnaHQoKSk7Cit9CisKK3ZvaWQgV2lk Z2V0OjpzZXRJc1NlbGVjdGVkKGJvb2wgaXNTZWxlY3RlZCkKK3sKKyAgICBub3RJbXBsZW1lbnRl ZCgpOworfQorCitpbnQgV2lkZ2V0OjpzY3JlZW5XaWR0aCgpIGNvbnN0Cit7CisgICAgY29uc3Qg V2lkZ2V0KiB3aWRnZXQgPSB0aGlzOworICAgIHdoaWxlICghd2lkZ2V0LT5pc0ZyYW1lVmlldygp KSB7CisgICAgICAgIHdpZGdldCA9IHdpZGdldC0+cGFyZW50KCk7CisgICAgICAgIGlmICghd2lk Z2V0KQorICAgICAgICAgICAgYnJlYWs7CisgICAgfQorICAgIGlmICghd2lkZ2V0KQorICAgICAg ICByZXR1cm4gMDsKKyAgICBhbmRyb2lkOjpXZWJWaWV3Q29yZSogY29yZSA9IGFuZHJvaWQ6Oldl YlZpZXdDb3JlOjpnZXRXZWJWaWV3Q29yZSgKKyAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgU2Ny b2xsVmlldyo+KHdpZGdldCkpOworICAgIGlmICghY29yZSkKKyAgICAgICAgcmV0dXJuIDA7Cisg ICAgcmV0dXJuIGNvcmUtPnNjcmVlbldpZHRoKCk7Cit9CisKK30gLy8gV2ViQ29yZSBuYW1lcHNh Y2UK