Title: [102872] trunk/Source/WebCore
- Revision
- 102872
- Author
- [email protected]
- Date
- 2011-12-14 19:24:55 -0800 (Wed, 14 Dec 2011)
Log Message
Clean up style in CSSStyleSelector.cpp
https://bugs.webkit.org/show_bug.cgi?id=74548
Reviewed by Ojan Vafai.
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::styleForElement):
(WebCore::CSSStyleSelector::pseudoStyleForElement):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (102871 => 102872)
--- trunk/Source/WebCore/ChangeLog 2011-12-15 03:22:03 UTC (rev 102871)
+++ trunk/Source/WebCore/ChangeLog 2011-12-15 03:24:55 UTC (rev 102872)
@@ -1,3 +1,14 @@
+2011-12-14 Tony Chang <[email protected]>
+
+ Clean up style in CSSStyleSelector.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=74548
+
+ Reviewed by Ojan Vafai.
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::styleForElement):
+ (WebCore::CSSStyleSelector::pseudoStyleForElement):
+
2011-12-14 Kenneth Russell <[email protected]>
Unreviewed, rolling out r102794.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (102871 => 102872)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-15 03:22:03 UTC (rev 102871)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-12-15 03:24:55 UTC (rev 102872)
@@ -1249,9 +1249,8 @@
// If resolveForRootDefault is true, style based on user agent style sheet only. This is used in media queries, where
// relative units are interpreted according to document root element style, styled only with UA stylesheet
-PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault, RenderRegion* regionForStyling)
+PassRefPtr<RenderStyle> CSSStyleSelector::styleForElement(Element* element, RenderStyle* defaultParent, bool allowSharing, bool resolveForRootDefault, RenderRegion*)
{
- UNUSED_PARAM(regionForStyling);
// Once an element has a renderer, we don't try to destroy it, since otherwise the renderer
// will vanish if a style recalc happens during loading.
if (allowSharing && !element->document()->haveStylesheetsLoaded() && !element->renderer()) {
@@ -1421,9 +1420,8 @@
}
}
-PassRefPtr<RenderStyle> CSSStyleSelector::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle, RenderRegion* regionForStyling)
+PassRefPtr<RenderStyle> CSSStyleSelector::pseudoStyleForElement(PseudoId pseudo, Element* e, RenderStyle* parentStyle, RenderRegion*)
{
- UNUSED_PARAM(regionForStyling);
if (!e)
return 0;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
