Summary: | [BlackBerry] Fix usage of BlackBerry::Platform::String | ||||||||
---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Alberto Garcia <berto> | ||||||
Component: | WebKit BlackBerry | Assignee: | Nobody <webkit-unassigned> | ||||||
Status: | RESOLVED FIXED | ||||||||
Severity: | Normal | CC: | anilsson, commit-queue | ||||||
Priority: | P2 | ||||||||
Version: | 528+ (Nightly build) | ||||||||
Hardware: | Unspecified | ||||||||
OS: | Unspecified | ||||||||
Bug Depends on: | |||||||||
Bug Blocks: | 111729 | ||||||||
Attachments: |
|
Description
Alberto Garcia
2013-05-08 01:51:43 PDT
Created attachment 201044 [details]
Patch
Comment on attachment 201044 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=201044&action=review > Source/WebKit/blackberry/Api/WebSettings.cpp:209 > + DEFINE_STATIC_LOCAL(AtomicString, WebKitMonospace, ("-webkit-monospace")); > + DEFINE_STATIC_LOCAL(AtomicString, WebKitSansSerif, ("-webkit-sans-serif")); > + DEFINE_STATIC_LOCAL(AtomicString, WebKitSerif, ("-webkit-serif")); > + DEFINE_STATIC_LOCAL(AtomicString, WebKitStandard, ("-webkit-standard")); Given that "settings" is static local, you will never hit this path again. Why would you define those static? It also looks like your "WebSettings" class takes a String, not an AtomicString. (In reply to comment #2) > (From update of attachment 201044 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=201044&action=review > > > Source/WebKit/blackberry/Api/WebSettings.cpp:209 > > + DEFINE_STATIC_LOCAL(AtomicString, WebKitMonospace, ("-webkit-monospace")); > > + DEFINE_STATIC_LOCAL(AtomicString, WebKitSansSerif, ("-webkit-sans-serif")); > > + DEFINE_STATIC_LOCAL(AtomicString, WebKitSerif, ("-webkit-serif")); > > + DEFINE_STATIC_LOCAL(AtomicString, WebKitStandard, ("-webkit-standard")); > > Given that "settings" is static local, you will never hit this path again. Why would you define those static? > > It also looks like your "WebSettings" class takes a String, not an AtomicString. One possible reasoning behind this could be: "-webkit-monospace" will be added into the AtomicString table sooner or later anyway, or could already be in the table at this point. That depends on if/how -webkit-monospace is used down in WebCore. Anyway I think Benjamin is right in that it's not necessary to define these static. I'll update the patch to fix that. I'll also add a few more changes from a different internal commit that can also go here. Created attachment 201057 [details]
Patch
Second try.
Comment on attachment 201057 [details]
Patch
LGTM.
Comment on attachment 201057 [details] Patch Clearing flags on attachment: 201057 Committed r149769: <http://trac.webkit.org/changeset/149769> All reviewed patches have been landed. Closing bug. |