<!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>[178123] trunk/Source/WebCore</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/178123">178123</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-08 12:05:15 -0800 (Thu, 08 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unfriend StyleResolver and StyleBuilderCustom
https://bugs.webkit.org/show_bug.cgi?id=140247
Reviewed by Darin Adler.
Stop marking StyleBuilderCustom as a friend of StyleResolver by
refactoring the code a bit.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueFont):
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyFont):
* css/StyleResolver.h:
(WebCore::StyleResolver::documentSettings):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolverh">trunk/Source/WebCore/css/StyleResolver.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178122 => 178123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-08 19:24:14 UTC (rev 178122)
+++ trunk/Source/WebCore/ChangeLog 2015-01-08 20:05:15 UTC (rev 178123)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-01-08 Chris Dumez <cdumez@apple.com>
+
+ Unfriend StyleResolver and StyleBuilderCustom
+ https://bugs.webkit.org/show_bug.cgi?id=140247
+
+ Reviewed by Darin Adler.
+
+ Stop marking StyleBuilderCustom as a friend of StyleResolver by
+ refactoring the code a bit.
+
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueFont):
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyFont):
+ * css/StyleResolver.h:
+ (WebCore::StyleResolver::documentSettings):
+
</ins><span class="cx"> 2015-01-08 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics] Update fixedVisibleContentRect only it is actually changed
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178122 => 178123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-08 19:24:14 UTC (rev 178122)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-08 20:05:15 UTC (rev 178123)
</span><span class="lines">@@ -1260,24 +1260,8 @@
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (is<CSSFontValue>(value)) {
- auto& font = downcast<CSSFontValue>(value);
- if (!font.style || !font.variant || !font.weight || !font.size || !font.lineHeight || !font.family)
- return;
- styleResolver.applyProperty(CSSPropertyFontStyle, font.style.get());
- styleResolver.applyProperty(CSSPropertyFontVariant, font.variant.get());
- styleResolver.applyProperty(CSSPropertyFontWeight, font.weight.get());
- // The previous properties can dirty our font but they don't try to read the font's
- // properties back, which is safe. However if font-size is using the 'ex' unit, it will
- // need query the dirtied font's x-height to get the computed size. To be safe in this
- // case, let's just update the font now.
- styleResolver.updateFont();
- styleResolver.applyProperty(CSSPropertyFontSize, font.size.get());
-
- styleResolver.state().setLineHeightValue(font.lineHeight.get());
-
- styleResolver.applyProperty(CSSPropertyFontFamily, font.family.get());
- }
</del><ins>+ if (is<CSSFontValue>(value))
+ styleResolver.applyFont(downcast<CSSFontValue>(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyInitialContent(StyleResolver& styleResolver)
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178122 => 178123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-08 19:24:14 UTC (rev 178122)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-08 20:05:15 UTC (rev 178123)
</span><span class="lines">@@ -1838,6 +1838,25 @@
</span><span class="cx"> applyProperty(id, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StyleResolver::applyFont(CSSFontValue& font)
+{
+ if (!font.style || !font.variant || !font.weight || !font.size || !font.lineHeight || !font.family)
+ return;
+ applyProperty(CSSPropertyFontStyle, font.style.get());
+ applyProperty(CSSPropertyFontVariant, font.variant.get());
+ applyProperty(CSSPropertyFontWeight, font.weight.get());
+ // The previous properties can dirty our font but they don't try to read the font's
+ // properties back, which is safe. However if font-size is using the 'ex' unit, it will
+ // need query the dirtied font's x-height to get the computed size. To be safe in this
+ // case, let's just update the font now.
+ updateFont();
+ applyProperty(CSSPropertyFontSize, font.size.get());
+
+ m_state.setLineHeightValue(font.lineHeight.get());
+
+ applyProperty(CSSPropertyFontFamily, font.family.get());
+}
+
</ins><span class="cx"> inline bool isValidVisitedLinkProperty(CSSPropertyID id)
</span><span class="cx"> {
</span><span class="cx"> switch (id) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolverh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.h (178122 => 178123)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.h 2015-01-08 19:24:14 UTC (rev 178122)
+++ trunk/Source/WebCore/css/StyleResolver.h 2015-01-08 20:05:15 UTC (rev 178123)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> class CSSFontSelector;
</span><span class="cx"> class CSSFontFace;
</span><span class="cx"> class CSSFontFaceRule;
</span><ins>+class CSSFontValue;
</ins><span class="cx"> class CSSImageGeneratorValue;
</span><span class="cx"> class CSSImageSetValue;
</span><span class="cx"> class CSSImageValue;
</span><span class="lines">@@ -161,6 +162,7 @@
</span><span class="cx"> RenderStyle* rootElementStyle() const { return m_state.rootElementStyle(); }
</span><span class="cx"> Element* element() { return m_state.element(); }
</span><span class="cx"> Document& document() { return m_document; }
</span><ins>+ Settings* documentSettings() { return m_document.settings(); }
</ins><span class="cx">
</span><span class="cx"> // FIXME: It could be better to call m_ruleSets.appendAuthorStyleSheets() directly after we factor StyleRsolver further.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=108890
</span><span class="lines">@@ -200,6 +202,7 @@
</span><span class="cx">
</span><span class="cx"> void applyPropertyToCurrentStyle(CSSPropertyID, CSSValue*);
</span><span class="cx">
</span><ins>+ void applyFont(CSSFontValue&);
</ins><span class="cx"> void updateFont();
</span><span class="cx"> void initializeFontStyle(Settings*);
</span><span class="cx">
</span><span class="lines">@@ -286,8 +289,6 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- friend class StyleBuilderCustom;
-
</del><span class="cx"> // This function fixes up the default font size if it detects that the current generic font family has changed. -dwh
</span><span class="cx"> void checkForGenericFamilyChange(RenderStyle*, RenderStyle* parentStyle);
</span><span class="cx"> void checkForZoomChange(RenderStyle*, RenderStyle* parentStyle);
</span><span class="lines">@@ -319,7 +320,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> void matchPageRules(MatchResult&, RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName);
</span><span class="cx"> void matchPageRulesForList(Vector<StyleRulePage*>& matchedRules, const Vector<StyleRulePage*>&, bool isLeftPage, bool isFirstPage, const String& pageName);
</span><del>- Settings* documentSettings() { return m_document.settings(); }
</del><span class="cx">
</span><span class="cx"> bool isLeftPage(int pageIndex) const;
</span><span class="cx"> bool isRightPage(int pageIndex) const { return !isLeftPage(pageIndex); }
</span></span></pre>
</div>
</div>
</body>
</html>