<!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>[169223] trunk/Source</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/169223">169223</a></dd>
<dt>Author</dt> <dd>mhock@apple.com</dd>
<dt>Date</dt> <dd>2014-05-22 14:46:23 -0700 (Thu, 22 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Enable -apple-system- styled elements to respond to system font size changes.
https://bugs.webkit.org/show_bug.cgi?id=133186
<rdar://problem/16583782>
Reviewed by Enrica Casucci.
Source/WebCore:
* WebCore.exp.in:
* WebCore.xcodeproj/project.pbxproj:
* rendering/RenderThemeIOS.h:
* rendering/RenderThemeIOS.mm:
(WebCore::_contentSizeCategory):
(WebCore::RenderThemeIOS::contentSizeCategory):
(WebCore::RenderThemeIOS::setContentSizeCategory):
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
(-[WKWebView _contentSizeCategoryDidChange:]):
(-[WKWebView _contentSizeCategory]):
* UIProcess/WebPageProxy.h:
* UIProcess/ios/WebPageProxyIOS.mm:
(WebKit::WebPageProxy::contentSizeCategoryDidChange):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::contentSizeCategoryDidChange):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSh">trunk/Source/WebCore/rendering/RenderThemeIOS.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebCore/ChangeLog 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-05-22 Martin Hock <mhock@apple.com>
+
+ [iOS] Enable -apple-system- styled elements to respond to system font size changes.
+ https://bugs.webkit.org/show_bug.cgi?id=133186
+ <rdar://problem/16583782>
+
+ Reviewed by Enrica Casucci.
+
+ * WebCore.exp.in:
+ * WebCore.xcodeproj/project.pbxproj:
+ * rendering/RenderThemeIOS.h:
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::_contentSizeCategory):
+ (WebCore::RenderThemeIOS::contentSizeCategory):
+ (WebCore::RenderThemeIOS::setContentSizeCategory):
+
</ins><span class="cx"> 2014-05-22 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Stored samples are not freed when SourceBuffer is removed from MediaSource
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -2515,6 +2515,7 @@
</span><span class="cx"> __ZN7WebCore14FrameSelection6moveToERKNS_15VisiblePositionENS_14EUserTriggeredENS0_19CursorAlignOnScrollE
</span><span class="cx"> __ZN7WebCore14FrameSelection6moveToERKNS_15VisiblePositionES3_NS_14EUserTriggeredE
</span><span class="cx"> __ZN7WebCore14IconController3urlEv
</span><ins>+__ZN7WebCore14RenderThemeIOS22setContentSizeCategoryERKN3WTF6StringE
</ins><span class="cx"> __ZN7WebCore14ResourceHandle6cancelEv
</span><span class="cx"> __ZN7WebCore14ResourceHandle9setClientEPNS_20ResourceHandleClientE
</span><span class="cx"> __ZN7WebCore14ResourceHandleD1Ev
</span><span class="lines">@@ -2627,6 +2628,7 @@
</span><span class="cx"> __ZN7WebCore4Icon18createIconForImageEP7CGImage
</span><span class="cx"> __ZN7WebCore4Node17isContentEditableENS0_22UserSelectAllTreatmentE
</span><span class="cx"> __ZN7WebCore4Node23compareDocumentPositionEPS0_
</span><ins>+__ZN7WebCore4Page52updateStyleForAllPagesAfterGlobalChangeInEnvironmentEv
</ins><span class="cx"> __ZN7WebCore5ColorC1EP7CGColor
</span><span class="cx"> __ZN7WebCore5EventC1ERKN3WTF12AtomicStringEbb
</span><span class="cx"> __ZN7WebCore5Frame15setTimersPausedEb
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -2269,6 +2269,7 @@
</span><span class="cx"> 75793ED30D0CE85B007FC0AC /* DOMMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED00D0CE85B007FC0AC /* DOMMessageEvent.h */; };
</span><span class="cx"> 75793ED40D0CE85B007FC0AC /* DOMMessageEvent.mm in Sources */ = {isa = PBXBuildFile; fileRef = 75793ED10D0CE85B007FC0AC /* DOMMessageEvent.mm */; };
</span><span class="cx"> 75793ED50D0CE85B007FC0AC /* DOMMessageEventInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 75793ED20D0CE85B007FC0AC /* DOMMessageEventInternal.h */; };
</span><ins>+ 759CB837192DA9190012BC64 /* ControlStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 311C08BC18E35D6800B65615 /* ControlStates.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 75DCC7B818B81C8800A57128 /* SessionIDHash.h in Headers */ = {isa = PBXBuildFile; fileRef = 75DCC7B718B81C8800A57128 /* SessionIDHash.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7633A72613D8B33A008501B6 /* LocaleToScriptMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 7633A72413D8B33A008501B6 /* LocaleToScriptMapping.h */; };
</span><span class="cx"> 7633A72713D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7633A72513D8B33A008501B6 /* LocaleToScriptMappingDefault.cpp */; };
</span><span class="lines">@@ -5390,7 +5391,7 @@
</span><span class="cx"> BCEA4887097D93020094C9E4 /* RenderThemeMac.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA4848097D93020094C9E4 /* RenderThemeMac.h */; };
</span><span class="cx"> BCEA4888097D93020094C9E4 /* RenderThemeMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BCEA4849097D93020094C9E4 /* RenderThemeMac.mm */; };
</span><span class="cx"> BCEA4889097D93020094C9E4 /* RenderTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA484A097D93020094C9E4 /* RenderTheme.cpp */; };
</span><del>- BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA484B097D93020094C9E4 /* RenderTheme.h */; };
</del><ins>+ BCEA488A097D93020094C9E4 /* RenderTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA484B097D93020094C9E4 /* RenderTheme.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> BCEA488B097D93020094C9E4 /* RenderText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA484C097D93020094C9E4 /* RenderText.cpp */; };
</span><span class="cx"> BCEA488C097D93020094C9E4 /* RenderText.h in Headers */ = {isa = PBXBuildFile; fileRef = BCEA484D097D93020094C9E4 /* RenderText.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> BCEA488D097D93020094C9E4 /* RenderTextFragment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCEA484E097D93020094C9E4 /* RenderTextFragment.cpp */; };
</span><span class="lines">@@ -6600,7 +6601,7 @@
</span><span class="cx"> FED13D3A0CEA934600D89466 /* EditorIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D390CEA934600D89466 /* EditorIOS.mm */; };
</span><span class="cx"> FED13D3D0CEA936A00D89466 /* FrameIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D3B0CEA936A00D89466 /* FrameIOS.mm */; };
</span><span class="cx"> FED13D400CEA939400D89466 /* IconIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = FED13D3F0CEA939400D89466 /* IconIOS.mm */; };
</span><del>- FED13D520CEA949700D89466 /* RenderThemeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = FED13D500CEA949700D89466 /* RenderThemeIOS.h */; };
</del><ins>+ FED13D520CEA949700D89466 /* RenderThemeIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = FED13D500CEA949700D89466 /* RenderThemeIOS.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> FED48390CED66C3255F72C59 /* MathMLSelectElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F75A059AF170D8FAA5B8CABE /* MathMLSelectElement.cpp */; };
</span><span class="cx"> FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDEF83F16797108000E444A /* DatabaseStrategy.cpp */; };
</span><span class="cx"> FEDEF84216797108000E444A /* DatabaseStrategy.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDEF84016797108000E444A /* DatabaseStrategy.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -25760,6 +25761,7 @@
</span><span class="cx"> 97BC6A451505F081001B74AC /* SQLResultSetRowList.h in Headers */,
</span><span class="cx"> 97BC6A481505F081001B74AC /* SQLStatement.h in Headers */,
</span><span class="cx"> FE8A674816CDD19E00930BF8 /* SQLStatementBackend.h in Headers */,
</span><ins>+ 759CB837192DA9190012BC64 /* ControlStates.h in Headers */,
</ins><span class="cx"> 97BC6A491505F081001B74AC /* SQLStatementCallback.h in Headers */,
</span><span class="cx"> 97BC6A4B1505F081001B74AC /* SQLStatementErrorCallback.h in Headers */,
</span><span class="cx"> 97BC6A4E1505F081001B74AC /* SQLStatementSync.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.h (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.h 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.h 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx">
</span><span class="cx"> static CFStringRef contentSizeCategory();
</span><span class="cx">
</span><ins>+ static void setContentSizeCategory(const String&);
+
</ins><span class="cx"> protected:
</span><span class="cx"> virtual int baselinePosition(const RenderObject&) const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -306,11 +306,24 @@
</span><span class="cx"> return adoptRef(new RenderThemeIOS);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static String& _contentSizeCategory()
+{
+ static NeverDestroyed<String> _contentSizeCategory;
+ return _contentSizeCategory.get();
+}
+
</ins><span class="cx"> CFStringRef RenderThemeIOS::contentSizeCategory()
</span><span class="cx"> {
</span><ins>+ if (!_contentSizeCategory().isNull())
+ return (__bridge CFStringRef)static_cast<NSString*>(_contentSizeCategory());
</ins><span class="cx"> return (CFStringRef)[[getUIApplicationClass() sharedApplication] preferredContentSizeCategory];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderThemeIOS::setContentSizeCategory(const String& contentSizeCategory)
+{
+ _contentSizeCategory() = contentSizeCategory;
+}
+
</ins><span class="cx"> const Color& RenderThemeIOS::shadowColor() const
</span><span class="cx"> {
</span><span class="cx"> static Color color(0.0f, 0.0f, 0.0f, 0.7f);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-05-22 Martin Hock <mhock@apple.com>
+
+ [iOS] Enable -apple-system- styled elements to respond to system font size changes.
+ https://bugs.webkit.org/show_bug.cgi?id=133186
+ <rdar://problem/16583782>
+
+ Reviewed by Enrica Casucci.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ (-[WKWebView _contentSizeCategoryDidChange:]):
+ (-[WKWebView _contentSizeCategory]):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::contentSizeCategoryDidChange):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::contentSizeCategoryDidChange):
+
</ins><span class="cx"> 2014-05-22 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Add CFBundleAllowMixedLocalizations to WebContentService
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import <CoreGraphics/CGFloat.h>
</span><span class="cx"> #import <CoreGraphics/CGPDFDocumentPrivate.h>
</span><ins>+#import <UIKit/UIApplication.h>
</ins><span class="cx"> #import <UIKit/UIPeripheralHost_Private.h>
</span><span class="cx"> #import <QuartzCore/CARenderServer.h>
</span><span class="cx"> #import <QuartzCore/QuartzCorePrivate.h>
</span><span class="lines">@@ -232,6 +233,8 @@
</span><span class="cx"> [center addObserver:self selector:@selector(_keyboardDidChangeFrame:) name:UIKeyboardDidChangeFrameNotification object:nil];
</span><span class="cx"> [center addObserver:self selector:@selector(_keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
</span><span class="cx"> [center addObserver:self selector:@selector(_keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
</span><ins>+ [center addObserver:self selector:@selector(_contentSizeCategoryDidChange:) name:UIContentSizeCategoryDidChangeNotification object:nil];
+ _page->contentSizeCategoryDidChange([self _contentSizeCategory]);
</ins><span class="cx">
</span><span class="cx"> [[_configuration _contentProviderRegistry] addPage:*_page];
</span><span class="cx"> #endif
</span><span class="lines">@@ -1030,6 +1033,16 @@
</span><span class="cx"> [self _keyboardChangedWithInfo:notification.userInfo adjustScrollView:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_contentSizeCategoryDidChange:(NSNotification *)notification
+{
+ _page->contentSizeCategoryDidChange([self _contentSizeCategory]);
+}
+
+- (NSString *)_contentSizeCategory
+{
+ return [[UIApplication sharedApplication] preferredContentSizeCategory];
+}
+
</ins><span class="cx"> - (void)setAllowsBackForwardNavigationGestures:(BOOL)allowsBackForwardNavigationGestures
</span><span class="cx"> {
</span><span class="cx"> if (_allowsBackForwardNavigationGestures == allowsBackForwardNavigationGestures)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -634,6 +634,7 @@
</span><span class="cx"> void didNotHandleTapAsClick(const WebCore::IntPoint&);
</span><span class="cx"> void viewportMetaTagWidthDidChange(float width);
</span><span class="cx"> void didFinishDrawingPagesToPDF(const IPC::DataReference&);
</span><ins>+ void contentSizeCategoryDidChange(const String& contentSizeCategory);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> const EditorState& editorState() const { return m_editorState; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -654,6 +654,11 @@
</span><span class="cx"> m_pageClient.didFinishDrawingPagesToPDF(pdfData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPageProxy::contentSizeCategoryDidChange(const String& contentSizeCategory)
+{
+ process().send(Messages::WebPage::ContentSizeCategoryDidChange(contentSizeCategory), m_pageID);
+}
+
</ins><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didStartLoadForQuickLookDocumentInMainFrame(const String& fileName, const String& uti)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -487,6 +487,7 @@
</span><span class="cx"> void updateSelectionAppearance();
</span><span class="cx">
</span><span class="cx"> void dispatchAsynchronousTouchEvents(const Vector<WebTouchEvent, 1>& queue);
</span><ins>+ void contentSizeCategoryDidChange(const String&);
</ins><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> void showInspectorIndication();
</span><span class="cx"> void hideInspectorIndication();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx"> ApplicationWillResignActive()
</span><span class="cx"> ApplicationWillEnterForeground()
</span><span class="cx"> ApplicationDidBecomeActive()
</span><ins>+ ContentSizeCategoryDidChange(String contentSizeCategory)
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (169222 => 169223)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-22 21:45:45 UTC (rev 169222)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-22 21:46:23 UTC (rev 169223)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx"> #import <WebCore/PlatformMouseEvent.h>
</span><span class="cx"> #import <WebCore/RenderBlock.h>
</span><span class="cx"> #import <WebCore/RenderImage.h>
</span><ins>+#import <WebCore/RenderThemeIOS.h>
</ins><span class="cx"> #import <WebCore/RenderView.h>
</span><span class="cx"> #import <WebCore/ResourceBuffer.h>
</span><span class="cx"> #import <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -2326,6 +2327,12 @@
</span><span class="cx"> send(Messages::WebPageProxy::DidFinishDrawingPagesToPDF(IPC::DataReference(CFDataGetBytePtr(pdfPageData.get()), CFDataGetLength(pdfPageData.get()))));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebPage::contentSizeCategoryDidChange(const String& contentSizeCategory)
+{
+ RenderThemeIOS::setContentSizeCategory(contentSizeCategory);
+ Page::updateStyleForAllPagesAfterGlobalChangeInEnvironment();
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>