<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211156] trunk/Source/WebKit</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211156">211156</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2017-01-25 12:02:00 -0800 (Wed, 25 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>LoadWebLocalizedStrings method should be moved in correct file
https://bugs.webkit.org/show_bug.cgi?id=167393
Reviewed by Alexey Proskuryakov.
Source/WebKit/ios:
* Misc/WebUIKitSupport.mm:
(LoadWebLocalizedStringsTimerCallback): Moved from WebLocalizableStrings.mm
(LoadWebLocalizedStrings): Moved from WebLocalizableStrings.mm
Source/WebKit/mac:
* Misc/WebLocalizableStrings.h: Deleted LoadWebLocalizedStrings method.
* Misc/WebLocalizableStrings.mm:
(LoadWebLocalizedStringsTimerCallback): Deleted, moved to WebUIKitSupport.mm
(LoadWebLocalizedStrings): Deleted, moved to WebUIKitSupport.mm</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebUIKitSupportmm">trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebLocalizableStringsh">trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebLocalizableStringsmm">trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (211155 => 211156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2017-01-25 19:14:18 UTC (rev 211155)
+++ trunk/Source/WebKit/ios/ChangeLog 2017-01-25 20:02:00 UTC (rev 211156)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-01-25 Aakash Jain <aakash_jain@apple.com>
+
+ LoadWebLocalizedStrings method should be moved in correct file
+ https://bugs.webkit.org/show_bug.cgi?id=167393
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Misc/WebUIKitSupport.mm:
+ (LoadWebLocalizedStringsTimerCallback): Moved from WebLocalizableStrings.mm
+ (LoadWebLocalizedStrings): Moved from WebLocalizableStrings.mm
+
</ins><span class="cx"> 2017-01-21 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove PassRefPtr from "page" directory of WebCore, also deploy references
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebUIKitSupportmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm (211155 => 211156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2017-01-25 19:14:18 UTC (rev 211155)
+++ trunk/Source/WebKit/ios/Misc/WebUIKitSupport.mm 2017-01-25 20:02:00 UTC (rev 211156)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import "WebDatabaseManagerInternal.h"
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><del>-#import "WebLocalizableStrings.h"
</del><ins>+#import "WebLocalizableStringsInternal.h"
</ins><span class="cx"> #import "WebPlatformStrategies.h"
</span><span class="cx"> #import "WebSystemInterface.h"
</span><span class="cx"> #import "WebViewPrivate.h"
</span><span class="lines">@@ -51,6 +51,23 @@
</span><span class="cx"> return s_linkedOnOrAfterIOS5;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+// See <rdar://problem/7902473> Optimize WebLocalizedString for why we do this on a background thread on a timer callback
+static void LoadWebLocalizedStringsTimerCallback(CFRunLoopTimerRef timer, void *info)
+{
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^ {
+ // We don't care if we find this string, but searching for it will load the plist and save the results.
+ // FIXME: It would be nicer to do this in a more direct way.
+ UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
+ });
+}
+
+static void LoadWebLocalizedStrings()
+{
+ CFRunLoopTimerRef timer = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent(), 0, 0, 0, &LoadWebLocalizedStringsTimerCallback, NULL);
+ CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
+ CFRelease(timer);
+}
+
</ins><span class="cx"> void WebKitInitialize(void)
</span><span class="cx"> {
</span><span class="cx"> static bool webkitInitialized;
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (211155 => 211156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-01-25 19:14:18 UTC (rev 211155)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-01-25 20:02:00 UTC (rev 211156)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-01-25 Aakash Jain <aakash_jain@apple.com>
+
+ LoadWebLocalizedStrings method should be moved in correct file
+ https://bugs.webkit.org/show_bug.cgi?id=167393
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Misc/WebLocalizableStrings.h: Deleted LoadWebLocalizedStrings method.
+ * Misc/WebLocalizableStrings.mm:
+ (LoadWebLocalizedStringsTimerCallback): Deleted, moved to WebUIKitSupport.mm
+ (LoadWebLocalizedStrings): Deleted, moved to WebUIKitSupport.mm
+
</ins><span class="cx"> 2017-01-24 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add simple line layout toggle to MiniBrowser
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebLocalizableStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h (211155 => 211156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2017-01-25 19:14:18 UTC (rev 211155)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.h 2017-01-25 20:02:00 UTC (rev 211156)
</span><span class="lines">@@ -49,10 +49,6 @@
</span><span class="cx">
</span><span class="cx"> WebLocalizedStringType WebLocalizedString(WebLocalizableStringsBundle* bundle, const char* key);
</span><span class="cx">
</span><del>-#if TARGET_OS_IPHONE
-void LoadWebLocalizedStrings(void); // The first WebLocalizedString call can take over 20ms unless this function is called beforehand.
-#endif
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebLocalizableStringsmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm (211155 => 211156)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2017-01-25 19:14:18 UTC (rev 211155)
+++ trunk/Source/WebKit/mac/Misc/WebLocalizableStrings.mm 2017-01-25 20:02:00 UTC (rev 211156)
</span><span class="lines">@@ -31,11 +31,6 @@
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/MainThread.h>
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
-#import "WebLocalizableStringsInternal.h"
-#import <dispatch/dispatch.h>
-#endif
-
</del><span class="cx"> WebLocalizableStringsBundle WebKitLocalizableStringsBundle = { "com.apple.WebKit", 0 };
</span><span class="cx">
</span><span class="cx"> NSString *WebLocalizedString(WebLocalizableStringsBundle *stringsBundle, const char *key)
</span><span class="lines">@@ -72,24 +67,3 @@
</span><span class="cx"> ASSERT_WITH_MESSAGE(result != notFound, "could not find localizable string %s in bundle", key);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-
-#if PLATFORM(IOS)
-
-// See <rdar://problem/7902473> Optimize WebLocalizedString for why we do this on a background thread on a timer callback
-static void LoadWebLocalizedStringsTimerCallback(CFRunLoopTimerRef timer, void *info)
-{
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
- // We don't care if we find this string, but searching for it will load the plist and save the results.
- // FIXME: It would be nicer to do this in a more direct way.
- UI_STRING_KEY_INTERNAL("Typing", "Typing (Undo action name)", "Undo action name");
- });
-}
-
-void LoadWebLocalizedStrings(void)
-{
- CFRunLoopTimerRef timer = CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent(), 0, 0, 0, &LoadWebLocalizedStringsTimerCallback, NULL);
- CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopCommonModes);
- CFRelease(timer);
-}
-
-#endif
</del></span></pre>
</div>
</div>
</body>
</html>