Reflow comments in core/css
Note that some ASSERTs became DCHECKs, and some bitfields became unsigned
instead of uint16_t, because I reflowed a comment next to them.
BUG=563793
Review-Url: https://codereview.chromium.org/2392343005
Cr-Commit-Position: refs/heads/master@{#423514}
diff --git a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp
index a9aec71..2185f127 100644
--- a/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp
+++ b/third_party/WebKit/Source/core/css/AffectedByFocusTest.cpp
@@ -72,7 +72,8 @@
// A global :focus rule in html.css currently causes every single element to be
// affectedByFocus. Check that all elements in a document with no :focus rules
-// gets the affectedByFocus set on ComputedStyle and not childrenOrSiblingsAffectedByFocus.
+// gets the affectedByFocus set on ComputedStyle and not
+// childrenOrSiblingsAffectedByFocus.
TEST_F(AffectedByFocusTest, UAUniversalFocusRule) {
ElementResult expected[] = {{bodyTag, true, false},
{divTag, true, false},
@@ -89,7 +90,8 @@
checkElements(expected, sizeof(expected) / sizeof(ElementResult));
}
-// ":focus div" will mark ascendants of all divs with childrenOrSiblingsAffectedByFocus.
+// ":focus div" will mark ascendants of all divs with
+// childrenOrSiblingsAffectedByFocus.
TEST_F(AffectedByFocusTest, FocusedAscendant) {
ElementResult expected[] = {{bodyTag, true, true},
{divTag, true, true},
@@ -109,7 +111,8 @@
checkElements(expected, sizeof(expected) / sizeof(ElementResult));
}
-// "body:focus div" will mark the body element with childrenOrSiblingsAffectedByFocus.
+// "body:focus div" will mark the body element with
+// childrenOrSiblingsAffectedByFocus.
TEST_F(AffectedByFocusTest, FocusedAscendantWithType) {
ElementResult expected[] = {{bodyTag, true, true},
{divTag, true, false},
@@ -129,10 +132,11 @@
checkElements(expected, sizeof(expected) / sizeof(ElementResult));
}
-// ":not(body):focus div" should not mark the body element with childrenOrSiblingsAffectedByFocus.
-// Note that currently ":focus:not(body)" does not do the same. Then the :focus is
-// checked and the childrenOrSiblingsAffectedByFocus flag set before the negated type selector
-// is found.
+// ":not(body):focus div" should not mark the body element with
+// childrenOrSiblingsAffectedByFocus.
+// Note that currently ":focus:not(body)" does not do the same. Then the :focus
+// is checked and the childrenOrSiblingsAffectedByFocus flag set before the
+// negated type selector is found.
TEST_F(AffectedByFocusTest, FocusedAscendantWithNegatedType) {
ElementResult expected[] = {{bodyTag, true, false},
{divTag, true, true},
@@ -153,11 +157,11 @@
}
// Checking current behavior for ":focus + div", but this is a BUG or at best
-// sub-optimal. The focused element will also in this case get childrenOrSiblingsAffectedByFocus
-// even if it's really a sibling. Effectively, the whole sub-tree of the focused
-// element will have styles recalculated even though none of the children are
-// affected. There are other mechanisms that makes sure the sibling also gets its
-// styles recalculated.
+// sub-optimal. The focused element will also in this case get
+// childrenOrSiblingsAffectedByFocus even if it's really a sibling. Effectively,
+// the whole sub-tree of the focused element will have styles recalculated even
+// though none of the children are affected. There are other mechanisms that
+// makes sure the sibling also gets its styles recalculated.
TEST_F(AffectedByFocusTest, FocusedSibling) {
ElementResult expected[] = {{bodyTag, true, false},
{divTag, true, true},
@@ -277,7 +281,8 @@
TEST_F(AffectedByFocusTest, NoInvalidationSetFocusUpdate) {
// Check that when focussing the outer div in the document below, you get a
// style recalc for the outer div only. The invalidation set for :focus will
- // include 'a', but the id=d div should be affectedByFocus, not childrenOrSiblingsAffectedByFocus.
+ // include 'a', but the id=d div should be affectedByFocus, not
+ // childrenOrSiblingsAffectedByFocus.
setHtmlInnerHTML(
"<style>#nomatch:focus .a { border: 1px solid lime; }</style>"
diff --git a/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.h b/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.h
index cbdb532..a2b4b2f 100644
--- a/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.h
+++ b/third_party/WebKit/Source/core/css/CSSBorderImageSliceValue.h
@@ -52,8 +52,8 @@
private:
CSSBorderImageSliceValue(CSSQuadValue* slices, bool fill);
- // These four values are used to make "cuts" in the border image. They can be numbers
- // or percentages.
+ // These four values are used to make "cuts" in the border image. They can be
+ // numbers or percentages.
Member<CSSQuadValue> m_slices;
bool m_fill;
};
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
index f255404..71464e4f 100644
--- a/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSCalculationValue.cpp
@@ -193,7 +193,8 @@
value.percent += m_value->getDoubleValue() * multiplier;
break;
case CalcNumber:
- // TODO(alancutter): Stop treating numbers like pixels unconditionally in calcs to be able to accomodate border-image-width
+ // TODO(alancutter): Stop treating numbers like pixels unconditionally
+ // in calcs to be able to accomodate border-image-width
// https://drafts.csswg.org/css-backgrounds-3/#the-border-image-width
value.pixels +=
m_value->getDoubleValue() * conversionData.zoom() * multiplier;
@@ -267,7 +268,6 @@
};
static const CalculationCategory addSubtractResult[CalcOther][CalcOther] = {
- // CalcNumber CalcLength CalcPercent CalcPercentNumber CalcPercentLength CalcAngle CalcTime CalcFrequency CalcLengthNumber CalcPercentLengthNumber
/* CalcNumber */ {CalcNumber, CalcLengthNumber, CalcPercentNumber,
CalcPercentNumber, CalcOther, CalcOther, CalcOther,
CalcOther, CalcLengthNumber, CalcPercentLengthNumber},
diff --git a/third_party/WebKit/Source/core/css/CSSCalculationValue.h b/third_party/WebKit/Source/core/css/CSSCalculationValue.h
index 3976706cf..9fccae6 100644
--- a/third_party/WebKit/Source/core/css/CSSCalculationValue.h
+++ b/third_party/WebKit/Source/core/css/CSSCalculationValue.h
@@ -49,8 +49,8 @@
CalcDivide = '/'
};
-// The order of this enum should not change since its elements are used as indices
-// in the addSubtractResult matrix.
+// The order of this enum should not change since its elements are used as
+// indices in the addSubtractResult matrix.
enum CalculationCategory {
CalcNumber = 0,
CalcLength,
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
index eeee7a21..2f8c101 100644
--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2004 Zack Rusin <zack@kde.org>
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
* Copyright (C) 2011 Sencha, Inc. All rights reserved.
@@ -55,26 +56,27 @@
CSSPropertyBackgroundAttachment, CSSPropertyBackgroundBlendMode,
CSSPropertyBackgroundClip, CSSPropertyBackgroundColor,
CSSPropertyBackgroundImage, CSSPropertyBackgroundOrigin,
- CSSPropertyBackgroundPosition, // more-specific background-position-x/y are non-standard
- CSSPropertyBackgroundRepeat, CSSPropertyBackgroundSize,
- CSSPropertyBorderBottomColor, CSSPropertyBorderBottomLeftRadius,
- CSSPropertyBorderBottomRightRadius, CSSPropertyBorderBottomStyle,
- CSSPropertyBorderBottomWidth, CSSPropertyBorderCollapse,
- CSSPropertyBorderImageOutset, CSSPropertyBorderImageRepeat,
- CSSPropertyBorderImageSlice, CSSPropertyBorderImageSource,
- CSSPropertyBorderImageWidth, CSSPropertyBorderLeftColor,
- CSSPropertyBorderLeftStyle, CSSPropertyBorderLeftWidth,
- CSSPropertyBorderRightColor, CSSPropertyBorderRightStyle,
- CSSPropertyBorderRightWidth, CSSPropertyBorderTopColor,
- CSSPropertyBorderTopLeftRadius, CSSPropertyBorderTopRightRadius,
- CSSPropertyBorderTopStyle, CSSPropertyBorderTopWidth, CSSPropertyBottom,
- CSSPropertyBoxShadow, CSSPropertyBoxSizing, CSSPropertyBreakAfter,
- CSSPropertyBreakBefore, CSSPropertyBreakInside, CSSPropertyCaptionSide,
- CSSPropertyClear, CSSPropertyClip, CSSPropertyColor, CSSPropertyContent,
- CSSPropertyCursor, CSSPropertyDirection, CSSPropertyDisplay,
- CSSPropertyEmptyCells, CSSPropertyFloat, CSSPropertyFontFamily,
- CSSPropertyFontKerning, CSSPropertyFontSize, CSSPropertyFontSizeAdjust,
- CSSPropertyFontStretch, CSSPropertyFontStyle, CSSPropertyFontVariant,
+ // more-specific background-position-x/y are non-standard
+ CSSPropertyBackgroundPosition, CSSPropertyBackgroundRepeat,
+ CSSPropertyBackgroundSize, CSSPropertyBorderBottomColor,
+ CSSPropertyBorderBottomLeftRadius, CSSPropertyBorderBottomRightRadius,
+ CSSPropertyBorderBottomStyle, CSSPropertyBorderBottomWidth,
+ CSSPropertyBorderCollapse, CSSPropertyBorderImageOutset,
+ CSSPropertyBorderImageRepeat, CSSPropertyBorderImageSlice,
+ CSSPropertyBorderImageSource, CSSPropertyBorderImageWidth,
+ CSSPropertyBorderLeftColor, CSSPropertyBorderLeftStyle,
+ CSSPropertyBorderLeftWidth, CSSPropertyBorderRightColor,
+ CSSPropertyBorderRightStyle, CSSPropertyBorderRightWidth,
+ CSSPropertyBorderTopColor, CSSPropertyBorderTopLeftRadius,
+ CSSPropertyBorderTopRightRadius, CSSPropertyBorderTopStyle,
+ CSSPropertyBorderTopWidth, CSSPropertyBottom, CSSPropertyBoxShadow,
+ CSSPropertyBoxSizing, CSSPropertyBreakAfter, CSSPropertyBreakBefore,
+ CSSPropertyBreakInside, CSSPropertyCaptionSide, CSSPropertyClear,
+ CSSPropertyClip, CSSPropertyColor, CSSPropertyContent, CSSPropertyCursor,
+ CSSPropertyDirection, CSSPropertyDisplay, CSSPropertyEmptyCells,
+ CSSPropertyFloat, CSSPropertyFontFamily, CSSPropertyFontKerning,
+ CSSPropertyFontSize, CSSPropertyFontSizeAdjust, CSSPropertyFontStretch,
+ CSSPropertyFontStyle, CSSPropertyFontVariant,
CSSPropertyFontVariantLigatures, CSSPropertyFontVariantCaps,
CSSPropertyFontVariantNumeric, CSSPropertyFontWeight, CSSPropertyHeight,
CSSPropertyImageOrientation, CSSPropertyImageRendering,
@@ -386,8 +388,8 @@
Document& document = styledNode->document();
document.updateStyleAndLayoutTreeForNode(styledNode);
- // The style recalc could have caused the styled node to be discarded or replaced
- // if it was a PseudoElement so we need to update it.
+ // The style recalc could have caused the styled node to be discarded or
+ // replaced if it was a PseudoElement so we need to update it.
styledNode = this->styledNode();
LayoutObject* layoutObject = styledNode->layoutObject();
diff --git a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
index f4958a5..9d3947cb 100644
--- a/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
+++ b/third_party/WebKit/Source/core/css/CSSComputedStyleDeclaration.h
@@ -81,8 +81,8 @@
// The styled node is either the node passed into getComputedStyle, or the
// PseudoElement for :before and :after if they exist.
// FIXME: This should be styledElement since in JS getComputedStyle only works
- // on Elements, but right now editing creates these for text nodes. We should fix
- // that.
+ // on Elements, but right now editing creates these for text nodes. We should
+ // fix that.
Node* styledNode() const;
// CSSOM functions. Don't make these public.
diff --git a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
index e496ab1..7f75fae7 100644
--- a/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp
@@ -75,7 +75,8 @@
if (value->isImageGeneratorValue()) {
toCSSImageGeneratorValue(value)->loadSubimages(document);
- // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients and canvas).
+ // FIXME: Handle CSSImageGeneratorValue (and thus cross-fades with gradients
+ // and canvas).
return nullptr;
}
@@ -171,8 +172,9 @@
toImageSize = roundedIntSize(
toSVGImage(toImage)->concreteObjectSize(defaultObjectSize));
- // Rounding issues can cause transitions between images of equal size to return
- // a different fixed size; avoid performing the interpolation if the images are the same size.
+ // Rounding issues can cause transitions between images of equal size to
+ // return a different fixed size; avoid performing the interpolation if the
+ // images are the same size.
if (fromImageSize == toImageSize)
return fromImageSize;
diff --git a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp
index 3b7d3dd..6e764a9 100644
--- a/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSCursorImageValue.cpp
@@ -80,7 +80,8 @@
}
bool CSSCursorImageValue::isCachePending(float deviceScaleFactor) const {
- // Need to delegate completely so that changes in device scale factor can be handled appropriately.
+ // Need to delegate completely so that changes in device scale factor can be
+ // handled appropriately.
if (m_imageValue->isImageSetValue())
return toCSSImageSetValue(*m_imageValue).isCachePending(deviceScaleFactor);
return m_isCachePending;
@@ -103,12 +104,14 @@
if (m_isCachePending) {
m_isCachePending = false;
- // For SVG images we need to lazily substitute in the correct URL. Rather than attempt
- // to change the URL of the CSSImageValue (which would then change behavior like cssText),
- // we create an alternate CSSImageValue to use.
+ // For SVG images we need to lazily substitute in the correct URL. Rather
+ // than attempt to change the URL of the CSSImageValue (which would then
+ // change behavior like cssText), we create an alternate CSSImageValue to
+ // use.
if (hasFragmentInURL()) {
CSSImageValue* imageValue = toCSSImageValue(m_imageValue.get());
- // FIXME: This will fail if the <cursor> element is in a shadow DOM (bug 59827)
+ // FIXME: This will fail if the <cursor> element is in a shadow DOM
+ // (http://crbug/59827)
if (SVGCursorElement* cursorElement =
resourceReferencedByCursorElement(imageValue->url(), document)) {
CSSImageValue* svgImageValue =
diff --git a/third_party/WebKit/Source/core/css/CSSCustomIdentValue.h b/third_party/WebKit/Source/core/css/CSSCustomIdentValue.h
index 6f1e061..79f3500 100644
--- a/third_party/WebKit/Source/core/css/CSSCustomIdentValue.h
+++ b/third_party/WebKit/Source/core/css/CSSCustomIdentValue.h
@@ -17,7 +17,8 @@
return new CSSCustomIdentValue(str);
}
- // TODO(sashab, timloh): Remove this and lazily parse the CSSPropertyID in isKnownPropertyID().
+ // TODO(sashab, timloh): Remove this and lazily parse the CSSPropertyID in
+ // isKnownPropertyID().
static CSSCustomIdentValue* create(CSSPropertyID id) {
return new CSSCustomIdentValue(id);
}
diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp
index 23ecd32c..5283cbe 100644
--- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp
+++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -170,7 +172,8 @@
changedDefaultStyle = true;
}
- // FIXME: We should assert that this sheet only contains rules for <video> and <audio>.
+ // FIXME: We should assert that this sheet only contains rules for <video> and
+ // <audio>.
if (!m_mediaControlsStyleSheet &&
(isHTMLVideoElement(element) || isHTMLAudioElement(element))) {
String mediaRules = loadResourceAsASCIIString(
diff --git a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
index ae00128..c174300 100644
--- a/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
+++ b/third_party/WebKit/Source/core/css/CSSDefaultStyleSheets.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2013 Google Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp
index c179f67..2a7384bd11 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSource.cpp
@@ -49,14 +49,17 @@
}
// See if we have a mapping in our FontData cache.
- // TODO(drott): Check whether losing traits information here is problematic. crbug.com/516677
+ // TODO(drott): Check whether losing traits information here is problematic.
+ // crbug.com/516677
FontCacheKey key = fontDescription.cacheKey(FontFaceCreationParams());
RefPtr<SimpleFontData>& fontData =
m_fontDataTable.add(key, nullptr).storedValue->value;
if (!fontData)
fontData = createFontData(fontDescription);
- return fontData; // No release, because fontData is a reference to a RefPtr that is held in the m_fontDataTable.
+ // No release, because fontData is a reference to a RefPtr that is held in the
+ // m_fontDataTable.
+ return fontData;
}
DEFINE_TRACE(CSSFontFaceSource) {
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp
index b67c7ca..e9d3bc9 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSourceTest.cpp
@@ -42,7 +42,8 @@
TEST(CSSFontFaceSourceTest, HashCollision) {
DummyFontFaceSource fontFaceSource;
- // Even if the hash value collide, fontface cache should return different value for different fonts.
+ // Even if the hash value collide, fontface cache should return different
+ // value for different fonts.
EXPECT_EQ(simulateHashCalculation(2821), simulateHashCalculation(3346));
EXPECT_NE(fontFaceSource.getFontDataForSize(2821),
fontFaceSource.getFontDataForSize(3346));
diff --git a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
index 6a88cbe..fd77f75d 100644
--- a/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontFaceSrcValue.cpp
@@ -43,8 +43,10 @@
namespace blink {
bool CSSFontFaceSrcValue::isSupportedFormat() const {
- // Normally we would just check the format, but in order to avoid conflicts with the old WinIE style of font-face,
- // we will also check to see if the URL ends with .eot. If so, we'll go ahead and assume that we shouldn't load it.
+ // Normally we would just check the format, but in order to avoid conflicts
+ // with the old WinIE style of font-face, we will also check to see if the URL
+ // ends with .eot. If so, we'll go ahead and assume that we shouldn't load
+ // it.
if (m_format.isEmpty())
return m_absoluteResource.startsWith("data:", TextCaseInsensitive) ||
!m_absoluteResource.endsWith(".eot", TextCaseInsensitive);
diff --git a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
index ac73405..56f954d1 100644
--- a/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
+++ b/third_party/WebKit/Source/core/css/CSSFontSelector.cpp
@@ -46,10 +46,9 @@
: m_document(document),
m_genericFontFamilySettings(
document->frame()->settings()->genericFontFamilySettings()) {
- // FIXME: An old comment used to say there was no need to hold a reference to m_document
- // because "we are guaranteed to be destroyed before the document". But there does not
- // seem to be any such guarantee.
-
+ // FIXME: An old comment used to say there was no need to hold a reference to
+ // m_document because "we are guaranteed to be destroyed before the document".
+ // But there does not seem to be any such guarantee.
ASSERT(m_document);
DCHECK(m_document->frame());
FontCache::fontCache()->addClient(this);
@@ -127,7 +126,8 @@
m_fontFaceCache.get(fontDescription, familyName))
return face->getFontData(fontDescription);
- // Try to return the correct font based off our settings, in case we were handed the generic font family name.
+ // Try to return the correct font based off our settings, in case we were
+ // handed the generic font family name.
AtomicString settingsFamilyName = familyNameFromSettings(
m_genericFontFamilySettings, fontDescription, familyName);
if (settingsFamilyName.isEmpty())
diff --git a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
index 6f839cf..1803ec9 100644
--- a/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSGradientValue.cpp
@@ -78,7 +78,8 @@
if (!clients().contains(&layoutObject))
return nullptr;
- // Need to look up our size. Create a string of width*height to use as a hash key.
+ // Need to look up our size. Create a string of width*height to use as a
+ // hash key.
Image* result = getImage(&layoutObject, size);
if (result)
return result;
@@ -130,14 +131,16 @@
// color stops. The color values for the new color stops will be calculated
// using the color weighting formula defined in the spec. The new color
// stops will be positioned in such a way that all the pixels between the two
- // user defined color stops have color values close to the interpolation curve.
+ // user defined color stops have color values close to the interpolation
+ // curve.
// If the hint is closer to the left color stop, add 2 stops to the left and
// 6 to the right, else add 6 stops to the left and 2 to the right.
// The color stops on the side with more space start midway because
// the curve approximates a line in that region.
// Using this aproximation, it is possible to discern the color steps when
// the gradient is large. If this becomes an issue, we can consider improving
- // the algorithm, or adding support for color interpolation hints to skia shaders.
+ // the algorithm, or adding support for color interpolation hints to skia
+ // shaders.
int indexOffset = 0;
@@ -197,7 +200,8 @@
}
// calculate colors for the new color hints.
- // The color weighting for the new color stops will be pointRelativeOffset^(ln(0.5)/ln(hintRelativeOffset)).
+ // The color weighting for the new color stops will be
+ // pointRelativeOffset^(ln(0.5)/ln(hintRelativeOffset)).
float hintRelativeOffset = leftDist / totalDist;
for (size_t y = 0; y < 9; ++y) {
float pointRelativeOffset = (newStops[y].offset - offsetLeft) / totalDist;
@@ -259,7 +263,8 @@
return false;
}
-// Redistribute the stops such that they fully cover [0 , 1] and add them to the gradient.
+// Redistribute the stops such that they fully cover [0 , 1] and add them to the
+// gradient.
static bool normalizeAndAddStops(const Vector<GradientStop>& stops,
Gradient* gradient) {
ASSERT(stops.size() > 1);
@@ -272,10 +277,10 @@
// All stops are coincident -> use a single clamped offset value.
const float clampedOffset = std::min(std::max(firstOffset, 0.f), 1.f);
- // For repeating gradients, a coincident stop set defines a solid-color image with the color
- // of the last color-stop in the rule.
- // For non-repeating gradients, both the first color and the last color can be significant
- // (padding on both sides of the offset).
+ // For repeating gradients, a coincident stop set defines a solid-color
+ // image with the color of the last color-stop in the rule.
+ // For non-repeating gradients, both the first color and the last color can
+ // be significant (padding on both sides of the offset).
if (gradient->spreadMethod() != SpreadMethodRepeat)
gradient->addColorStop(clampedOffset, stops.first().color);
gradient->addColorStop(clampedOffset, stops.last().color);
@@ -299,7 +304,8 @@
return true;
}
-// Collapse all negative-offset stops to 0 and compute an interpolated color value for that point.
+// Collapse all negative-offset stops to 0 and compute an interpolated color
+// value for that point.
static void clampNegativeOffsets(Vector<GradientStop>& stops) {
float lastNegativeOffset = 0;
@@ -307,8 +313,8 @@
const float currentOffset = stops[i].offset;
if (currentOffset >= 0) {
if (i > 0) {
- // We found the negative -> positive offset transition: compute an interpolated
- // color value for 0 and use it with the last clamped stop.
+ // We found the negative -> positive offset transition: compute an
+ // interpolated color value for 0 and use it with the last clamped stop.
ASSERT(lastNegativeOffset < 0);
float lerpRatio =
-lastNegativeOffset / (currentOffset - lastNegativeOffset);
@@ -356,13 +362,14 @@
// Unlike linear gradients (where we can adjust the points arbitrarily),
// we cannot let our radii turn negative here.
if (adjustedR0 < 0) {
- // For the non-repeat case, this can never happen: clampNegativeOffsets() ensures we don't
- // have to deal with negative offsets at this point.
+ // For the non-repeat case, this can never happen: clampNegativeOffsets()
+ // ensures we don't have to deal with negative offsets at this point.
ASSERT(gradient->spreadMethod() == SpreadMethodRepeat);
- // When in repeat mode, we deal with it by repositioning both radii in the positive domain -
- // shifting them by a multiple of the radius span (which is the period of our repeating
- // gradient -> hence no visible side effects).
+ // When in repeat mode, we deal with it by repositioning both radii in the
+ // positive domain - shifting them by a multiple of the radius span (which
+ // is the period of our repeating gradient -> hence no visible side
+ // effects).
const float radiusSpan = adjustedR1 - adjustedR0;
const float shiftToPositive = radiusSpan * ceilf(-adjustedR0 / radiusSpan);
adjustedR0 += shiftToPositive;
@@ -426,8 +433,9 @@
}
stops[i].specified = true;
} else {
- // If the first color-stop does not have a position, its position defaults to 0%.
- // If the last color-stop does not have a position, its position defaults to 100%.
+ // If the first color-stop does not have a position, its position defaults
+ // to 0%. If the last color-stop does not have a position, its position
+ // defaults to 100%.
if (!i) {
stops[i].offset = 0;
stops[i].specified = true;
@@ -437,9 +445,9 @@
}
}
- // If a color-stop has a position that is less than the specified position of any
- // color-stop before it in the list, its position is changed to be equal to the
- // largest specified position of any color-stop before it.
+ // If a color-stop has a position that is less than the specified position
+ // of any color-stop before it in the list, its position is changed to be
+ // equal to the largest specified position of any color-stop before it.
if (stops[i].specified && i > 0) {
size_t prevSpecifiedIndex;
for (prevSpecifiedIndex = i - 1; prevSpecifiedIndex;
@@ -455,9 +463,10 @@
ASSERT(stops.first().specified && stops.last().specified);
- // If any color-stop still does not have a position, then, for each run of adjacent
- // color-stops without positions, set their positions so that they are evenly spaced
- // between the preceding and following color-stops with positions.
+ // If any color-stop still does not have a position, then, for each run of
+ // adjacent color-stops without positions, set their positions so that they
+ // are evenly spaced between the preceding and following color-stops with
+ // positions.
if (numStops > 2) {
size_t unspecifiedRunStart = 0;
bool inUnspecifiedRun = false;
@@ -490,12 +499,12 @@
replaceColorHintsWithColorStops(stops, m_stops);
}
- // At this point we have a fully resolved set of stops. Time to perform adjustments for
- // repeat gradients and degenerate values if needed.
+ // At this point we have a fully resolved set of stops. Time to perform
+ // adjustments for repeat gradients and degenerate values if needed.
if (requiresStopsNormalization(stops, gradient)) {
- // Negative offsets are only an issue for non-repeating radial gradients: linear gradient
- // points can be repositioned arbitrarily, and for repeating radial gradients we shift
- // the radii into equivalent positive values.
+ // Negative offsets are only an issue for non-repeating radial gradients:
+ // linear gradient points can be repositioned arbitrarily, and for repeating
+ // radial gradients we shift the radii into equivalent positive values.
if (isRadialGradientValue() && !m_repeating)
clampNegativeOffsets(stops);
@@ -525,8 +534,8 @@
int sign = 1;
int edgeDistance = isHorizontal ? size.width() : size.height();
- // In this case the center of the gradient is given relative to an edge in the form of:
- // [ top | bottom | right | left ] [ <percentage> | <length> ].
+ // In this case the center of the gradient is given relative to an edge in the
+ // form of: [ top | bottom | right | left ] [ <percentage> | <length> ].
if (value->isValuePair()) {
const CSSValuePair& pair = toCSSValuePair(*value);
CSSValueID originID = toCSSIdentifierValue(pair.first()).getValueID();
@@ -730,13 +739,15 @@
return result.toString();
}
-// Compute the endpoints so that a gradient of the given angle covers a box of the given size.
+// Compute the endpoints so that a gradient of the given angle covers a box of
+// the given size.
static void endPointsFromAngle(float angleDeg,
const IntSize& size,
FloatPoint& firstPoint,
FloatPoint& secondPoint,
CSSGradientType type) {
- // Prefixed gradients use "polar coordinate" angles, rather than "bearing" angles.
+ // Prefixed gradients use "polar coordinate" angles, rather than "bearing"
+ // angles.
if (type == CSSPrefixedLinearGradient)
angleDeg = 90 - angleDeg;
@@ -772,8 +783,8 @@
// but tan expects 0deg = E, 90deg = N.
float slope = tan(deg2rad(90 - angleDeg));
- // We find the endpoint by computing the intersection of the line formed by the slope,
- // and a line perpendicular to it that intersects the corner.
+ // We find the endpoint by computing the intersection of the line formed by
+ // the slope, and a line perpendicular to it that intersects the corner.
float perpendicularSlope = -1 / slope;
// Compute start corner relative to center, in Cartesian space (+y = up).
@@ -794,8 +805,8 @@
float endX = c / (slope - perpendicularSlope);
float endY = perpendicularSlope * endX + c;
- // We computed the end point, so set the second point,
- // taking into account the moved origin and the fact that we're in drawing space (+y = down).
+ // We computed the end point, so set the second point, taking into account the
+ // moved origin and the fact that we're in drawing space (+y = down).
secondPoint.set(halfWidth + endX, halfHeight - endY);
// Reflect around the center for the start point.
firstPoint.set(halfWidth - endX, halfHeight + endY);
@@ -1092,7 +1103,8 @@
enum EndShapeType { CircleEndShape, EllipseEndShape };
-// Compute the radius to the closest/farthest side (depending on the compare functor).
+// Compute the radius to the closest/farthest side (depending on the compare
+// functor).
FloatSize radiusToSide(const FloatPoint& point,
const FloatSize& size,
EndShapeType shape,
@@ -1112,8 +1124,8 @@
return FloatSize(dx, dy);
}
-// Compute the radius of an ellipse with center at 0,0 which passes through p, and has
-// width/height given by aspectRatio.
+// Compute the radius of an ellipse with center at 0,0 which passes through p,
+// and has width/height given by aspectRatio.
inline FloatSize ellipseRadius(const FloatPoint& p, float aspectRatio) {
// If the aspectRatio is 0 or infinite, the ellipse is completely flat.
// TODO(sashab): Implement Degenerate Radial Gradients, see crbug.com/635727.
@@ -1127,7 +1139,8 @@
return FloatSize(clampTo<float>(a), clampTo<float>(a / aspectRatio));
}
-// Compute the radius to the closest/farthest corner (depending on the compare functor).
+// Compute the radius to the closest/farthest corner (depending on the compare
+// functor).
FloatSize radiusToCorner(const FloatPoint& point,
const FloatSize& size,
EndShapeType shape,
@@ -1150,8 +1163,9 @@
return FloatSize(distance, distance);
ASSERT(shape == EllipseEndShape);
- // If the end shape is an ellipse, the gradient-shape has the same ratio of width to height
- // that it would if closest-side or farthest-side were specified, as appropriate.
+ // If the end shape is an ellipse, the gradient-shape has the same ratio of
+ // width to height that it would if closest-side or farthest-side were
+ // specified, as appropriate.
const FloatSize sideRadius =
radiusToSide(point, size, EllipseEndShape, compare);
diff --git a/third_party/WebKit/Source/core/css/CSSGradientValue.h b/third_party/WebKit/Source/core/css/CSSGradientValue.h
index 6e69cfd..76ba393 100644
--- a/third_party/WebKit/Source/core/css/CSSGradientValue.h
+++ b/third_party/WebKit/Source/core/css/CSSGradientValue.h
@@ -227,7 +227,8 @@
Member<CSSPrimitiveValue> m_firstRadius;
Member<CSSPrimitiveValue> m_secondRadius;
- // The below are only used for non-deprecated gradients. Any of them may be null.
+ // The below are only used for non-deprecated gradients. Any of them may be
+ // null.
Member<CSSIdentifierValue> m_shape;
Member<CSSIdentifierValue> m_sizingBehavior;
diff --git a/third_party/WebKit/Source/core/css/CSSGridAutoRepeatValue.h b/third_party/WebKit/Source/core/css/CSSGridAutoRepeatValue.h
index 8bb393e..d2cf256 100644
--- a/third_party/WebKit/Source/core/css/CSSGridAutoRepeatValue.h
+++ b/third_party/WebKit/Source/core/css/CSSGridAutoRepeatValue.h
@@ -10,17 +10,19 @@
namespace blink {
-// CSSGridAutoRepeatValue stores the track sizes and line numbers when the auto-repeat
-// syntax is used
+// CSSGridAutoRepeatValue stores the track sizes and line numbers when the
+// auto-repeat syntax is used
//
// Right now the auto-repeat syntax is as follows:
-// <auto-repeat> = repeat( [ auto-fill | auto-fit ], <line-names>? <fixed-size> <line-names>? )
+// <auto-repeat> = repeat( [ auto-fill | auto-fit ], <line-names>? <fixed-size>
+// <line-names>? )
//
-// meaning that only one fixed size track is allowed. It could be argued that a different
-// class storing two CSSGridLineNamesValue and one CSSValue (for the track size) fits
-// better but the CSSWG has left the door open to allow more than one track in the
-// future. That's why we're using a list, it's prepared for future changes and it also
-// allows us to keep the parsing algorithm almost intact.
+// meaning that only one fixed size track is allowed. It could be argued that a
+// different class storing two CSSGridLineNamesValue and one CSSValue (for the
+// track size) fits better but the CSSWG has left the door open to allow more
+// than one track in the future. That's why we're using a list, it's prepared
+// for future changes and it also allows us to keep the parsing algorithm almost
+// intact.
class CSSGridAutoRepeatValue : public CSSValueList {
public:
static CSSGridAutoRepeatValue* create(CSSValueID id) {
diff --git a/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp b/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
index 660f512..f9b8541 100644
--- a/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
+++ b/third_party/WebKit/Source/core/css/CSSGroupingRule.cpp
@@ -80,8 +80,9 @@
}
if (newRule->isImportRule()) {
- // FIXME: an HierarchyRequestError should also be thrown for a nested @media rule. They are
- // currently not getting parsed, resulting in a SyntaxError to get raised above.
+ // FIXME: an HierarchyRequestError should also be thrown for a nested @media
+ // rule. They are currently not getting parsed, resulting in a SyntaxError
+ // to get raised above.
exceptionState.throwDOMException(
HierarchyRequestError,
"'@import' rules cannot be inserted inside a group rule.");
diff --git a/third_party/WebKit/Source/core/css/CSSIdentifierValue.h b/third_party/WebKit/Source/core/css/CSSIdentifierValue.h
index b9b33cf..8944bc6 100644
--- a/third_party/WebKit/Source/core/css/CSSIdentifierValue.h
+++ b/third_party/WebKit/Source/core/css/CSSIdentifierValue.h
@@ -11,9 +11,10 @@
namespace blink {
-// CSSIdentifierValue stores CSS value keywords, e.g. 'none', 'auto', 'lower-roman'.
-// TODO(sashab): Rename this class to CSSKeywordValue once it no longer conflicts
-// with CSSOM's CSSKeywordValue class.
+// CSSIdentifierValue stores CSS value keywords, e.g. 'none', 'auto',
+// 'lower-roman'.
+// TODO(sashab): Rename this class to CSSKeywordValue once it no longer
+// conflicts with CSSOM's CSSKeywordValue class.
class CORE_EXPORT CSSIdentifierValue : public CSSValue {
public:
static CSSIdentifierValue* create(CSSValueID);
@@ -47,8 +48,8 @@
private:
explicit CSSIdentifierValue(CSSValueID);
- // TODO(sashab): Remove this function, and update mapping methods to specialize
- // the create() method instead.
+ // TODO(sashab): Remove this function, and update mapping methods to
+ // specialize the create() method instead.
template <typename T>
CSSIdentifierValue(T); // Defined in CSSPrimitiveValueMappings.h
diff --git a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.h b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.h
index 3099de67..b2ec4ac 100644
--- a/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.h
+++ b/third_party/WebKit/Source/core/css/CSSImageGeneratorValue.h
@@ -87,9 +87,10 @@
HashMap<IntSize, RefPtr<Image>>
m_images; // A cache of Image objects by image size.
- // TODO(Oilpan): when/if we can make the layoutObject point directly to the CSSImageGenerator value using
- // a member we don't need to have this hack where we keep a persistent to the instance as long as
- // there are clients in the LayoutObjectSizeCountMap.
+ // TODO(Oilpan): when/if we can make the layoutObject point directly to the
+ // CSSImageGenerator value using a member we don't need to have this hack
+ // where we keep a persistent to the instance as long as there are clients in
+ // the LayoutObjectSizeCountMap.
SelfKeepAlive<CSSImageGeneratorValue> m_keepAlive;
};
diff --git a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
index beeb3cf..4357df9a 100644
--- a/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImageSetValue.cpp
@@ -69,7 +69,8 @@
++i;
}
- // Sort the images so that they are stored in order from lowest resolution to highest.
+ // Sort the images so that they are stored in order from lowest resolution to
+ // highest.
std::sort(m_imagesInSet.begin(), m_imagesInSet.end(),
CSSImageSetValue::compareByScaleFactor);
}
@@ -103,9 +104,10 @@
fillImageSet();
if (isCachePending(deviceScaleFactor)) {
- // FIXME: In the future, we want to take much more than deviceScaleFactor into acount here.
- // All forms of scale should be included: Page::pageScaleFactor(), LocalFrame::pageZoomFactor(),
- // and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
+ // FIXME: In the future, we want to take much more than deviceScaleFactor
+ // into acount here. All forms of scale should be included:
+ // Page::pageScaleFactor(), LocalFrame::pageZoomFactor(), and any CSS
+ // transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
ImageWithScale image = bestImageForScaleFactor(deviceScaleFactor);
FetchRequest request(ResourceRequest(document.completeURL(image.imageURL)),
FetchInitiatorTypeNames::css);
@@ -145,7 +147,8 @@
ASSERT_WITH_SECURITY_IMPLICATION(i < length);
const CSSValue& scaleFactorValue = item(i);
result.append(scaleFactorValue.cssText());
- // FIXME: Eventually the scale factor should contain it's own unit http://wkb.ug/100120.
+ // FIXME: Eventually the scale factor should contain it's own unit
+ // http://wkb.ug/100120.
// For now 'x' is hard-coded in the parser, so we hard-code it here too.
result.append('x');
diff --git a/third_party/WebKit/Source/core/css/CSSImportRule.cpp b/third_party/WebKit/Source/core/css/CSSImportRule.cpp
index ed65c4e..f2a02e5 100644
--- a/third_party/WebKit/Source/core/css/CSSImportRule.cpp
+++ b/third_party/WebKit/Source/core/css/CSSImportRule.cpp
@@ -1,7 +1,8 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 2002-2003 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/CSSMarkup.cpp b/third_party/WebKit/Source/core/css/CSSMarkup.cpp
index e3ca1cec..3a1b9e6 100644
--- a/third_party/WebKit/Source/core/css/CSSMarkup.cpp
+++ b/third_party/WebKit/Source/core/css/CSSMarkup.cpp
@@ -1,10 +1,12 @@
/*
* Copyright (C) 2003 Lars Knoll (knoll@kde.org)
* Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
* Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
* Copyright (C) 2012 Intel Corporation. All rights reserved.
*
diff --git a/third_party/WebKit/Source/core/css/CSSMarkup.h b/third_party/WebKit/Source/core/css/CSSMarkup.h
index 834629a..2b847a7 100644
--- a/third_party/WebKit/Source/core/css/CSSMarkup.h
+++ b/third_party/WebKit/Source/core/css/CSSMarkup.h
@@ -1,8 +1,10 @@
/*
* Copyright (C) 2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights
+ * reserved.
* Copyright (C) 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
+ * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -29,7 +31,8 @@
namespace blink {
-// Common serializing methods. See: http://dev.w3.org/csswg/cssom/#common-serializing-idioms
+// Common serializing methods. See:
+// http://dev.w3.org/csswg/cssom/#common-serializing-idioms
void serializeIdentifier(const String& identifier,
StringBuilder& appendTo,
bool skipStartChecks = false);
diff --git a/third_party/WebKit/Source/core/css/CSSMatrix.cpp b/third_party/WebKit/Source/core/css/CSSMatrix.cpp
index c240e19..156510a 100644
--- a/third_party/WebKit/Source/core/css/CSSMatrix.cpp
+++ b/third_party/WebKit/Source/core/css/CSSMatrix.cpp
@@ -70,7 +70,8 @@
if (const CSSValue* value =
CSSParser::parseSingleValue(CSSPropertyTransform, string)) {
- // Check for a "none" transform. In these cases we can use the default identity matrix.
+ // Check for a "none" transform. In these cases we can use the default
+ // identity matrix.
if (value->isIdentifierValue() &&
(toCSSIdentifierValue(value))->getValueID() == CSSValueNone)
return;
@@ -186,7 +187,8 @@
}
String CSSMatrix::toString() const {
- // FIXME - Need to ensure valid CSS floating point values (https://bugs.webkit.org/show_bug.cgi?id=20674)
+ // FIXME - Need to ensure valid CSS floating point values
+ // (https://bugs.webkit.org/show_bug.cgi?id=20674)
if (m_matrix->isAffine())
return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix->a(),
m_matrix->b(), m_matrix->c(), m_matrix->d(),
diff --git a/third_party/WebKit/Source/core/css/CSSMatrix.h b/third_party/WebKit/Source/core/css/CSSMatrix.h
index 2b3af928..e9f5eab 100644
--- a/third_party/WebKit/Source/core/css/CSSMatrix.h
+++ b/third_party/WebKit/Source/core/css/CSSMatrix.h
@@ -99,48 +99,54 @@
// The following math function return a new matrix with the
// specified operation applied. The this value is not modified.
- // Multiply this matrix by secondMatrix, on the right (result = this * secondMatrix)
+ // Multiply this matrix by secondMatrix, on the right
+ // (result = this * secondMatrix)
CSSMatrix* multiply(CSSMatrix* secondMatrix) const;
- // Return the inverse of this matrix. Throw an exception if the matrix is not invertible
+ // Return the inverse of this matrix. Throw an exception if the matrix is not
+ // invertible.
CSSMatrix* inverse(ExceptionState&) const;
// Return this matrix translated by the passed values.
- // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D operations
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the translation values on the left (result = translation(x,y,z) * this)
+ // Passing a NaN will use a value of 0. This allows the 3D form to used for 2D
+ // operations.
+ // Operation is performed as though the this matrix is multiplied by a matrix
+ // with the translation values on the left
+ // (result = translation(x,y,z) * this)
CSSMatrix* translate(double x, double y, double z) const;
// Returns this matrix scaled by the passed values.
- // Passing scaleX or scaleZ as NaN uses a value of 1, but passing scaleY of NaN
- // makes it the same as scaleX. This allows the 3D form to used for 2D operations
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the scale values on the left (result = scale(x,y,z) * this)
+ // Passing scaleX or scaleZ as NaN uses a value of 1, but passing scaleY of
+ // NaN makes it the same as scaleX. This allows the 3D form to used for 2D
+ // operations Operation is performed as though the this matrix is multiplied
+ // by a matrix with the scale values on the left
+ // (result = scale(x,y,z) * this)
CSSMatrix* scale(double scaleX, double scaleY, double scaleZ) const;
// Returns this matrix rotated by the passed values.
// If rotY and rotZ are NaN, rotate about Z (rotX=0, rotateY=0, rotateZ=rotX).
// Otherwise use a rotation value of 0 for any passed NaN.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the rotation values on the left (result = rotation(x,y,z) * this)
+ // Operation is performed as though the this matrix is multiplied by a matrix
+ // with the rotation values on the left (result = rotation(x,y,z) * this)
CSSMatrix* rotate(double rotX, double rotY, double rotZ) const;
// Returns this matrix rotated about the passed axis by the passed angle.
// Passing a NaN will use a value of 0. If the axis is (0,0,0) use a value
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the rotation values on the left (result = rotation(x,y,z,angle) * this)
+ // Operation is performed as though the this matrix is multiplied by a matrix
+ // with the rotation values on the left
+ // (result = rotation(x,y,z,angle) * this)
CSSMatrix* rotateAxisAngle(double x, double y, double z, double angle) const;
// Return this matrix skewed along the X axis by the passed values.
// Passing a NaN will use a value of 0.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the skew values on the left (result = skewX(angle) * this)
+ // Operation is performed as though the this matrix is multiplied by a matrix
+ // with the skew values on the left (result = skewX(angle) * this)
CSSMatrix* skewX(double angle) const;
// Return this matrix skewed along the Y axis by the passed values.
// Passing a NaN will use a value of 0.
- // Operation is performed as though the this matrix is multiplied by a matrix with
- // the skew values on the left (result = skewY(angle) * this)
+ // Operation is performed as though the this matrix is multiplied by a matrix
+ // with the skew values on the left (result = skewY(angle) * this)
CSSMatrix* skewY(double angle) const;
const TransformationMatrix& transform() const { return *m_matrix; }
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
index 41779bb3..06f8c35 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.cpp
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -35,8 +36,10 @@
namespace {
-// Max/min values for CSS, needs to slightly smaller/larger than the true max/min values to allow for rounding without overflowing.
-// Subtract two (rather than one) to allow for values to be converted to float and back without exceeding the LayoutUnit::max.
+// Max/min values for CSS, needs to slightly smaller/larger than the true
+// max/min values to allow for rounding without overflowing.
+// Subtract two (rather than one) to allow for values to be converted to float
+// and back without exceeding the LayoutUnit::max.
const int maxValueForCssLength = INT_MAX / kFixedPointDenominator - 2;
const int minValueForCssLength = INT_MIN / kFixedPointDenominator + 2;
@@ -403,8 +406,9 @@
CSSPrimitiveValue::UnitType CSSPrimitiveValue::canonicalUnitTypeForCategory(
UnitCategory category) {
- // The canonical unit type is chosen according to the way CSSPropertyParser::validUnit() chooses the default unit
- // in each category (based on unitflags).
+ // The canonical unit type is chosen according to the way
+ // CSSPropertyParser::validUnit() chooses the default unit in each category
+ // (based on unitflags).
switch (category) {
case UNumber:
return UnitType::Number;
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
index f18e24b..cc86ca2 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValue.h
@@ -65,7 +65,8 @@
// values (e.g. calc(3px + 2em)).
class CORE_EXPORT CSSPrimitiveValue : public CSSValue {
public:
- // These units are iterated through, so be careful when adding or changing the order.
+ // These units are iterated through, so be careful when adding or changing the
+ // order.
enum class UnitType {
Unknown,
Number,
@@ -109,10 +110,11 @@
CalcLengthWithNumber,
CalcPercentageWithLengthAndNumber,
- // This value is used to handle quirky margins in reflow roots (body, td, and th) like WinIE.
- // The basic idea is that a stylesheet can use the value __qem (for quirky em) instead of em.
- // When the quirky value is used, if you're in quirks mode, the margin will collapse away
- // inside a table cell. This quirk is specified in the HTML spec but our impl is different.
+ // This value is used to handle quirky margins in reflow roots (body, td,
+ // and th) like WinIE. The basic idea is that a stylesheet can use the value
+ // __qem (for quirky em) instead of em. When the quirky value is used, if
+ // you're in quirks mode, the margin will collapse away inside a table cell.
+ // This quirk is specified in the HTML spec but our impl is different.
// TODO: Remove this. crbug.com/443952
QuirkyEms,
};
@@ -129,7 +131,8 @@
UnitTypeViewportMin,
UnitTypeViewportMax,
- // This value must come after the last length unit type to enable iteration over the length unit types.
+ // This value must come after the last length unit type to enable iteration
+ // over the length unit types.
LengthUnitTypeCount,
};
@@ -265,7 +268,8 @@
static UnitType canonicalUnitTypeForCategory(UnitCategory);
static double conversionToCanonicalUnitsScaleFactor(UnitType);
- // Returns true and populates lengthUnitType, if unitType is a length unit. Otherwise, returns false.
+ // Returns true and populates lengthUnitType, if unitType is a length unit.
+ // Otherwise, returns false.
static bool unitTypeToLengthUnitType(UnitType, LengthUnitType&);
static UnitType lengthUnitTypeToUnitType(LengthUnitType);
@@ -302,7 +306,8 @@
union {
double num;
- // FIXME: oilpan: Should be a member, but no support for members in unions. Just trace the raw ptr for now.
+ // FIXME: oilpan: Should be a member, but no support for members in unions.
+ // Just trace the raw ptr for now.
CSSCalcValue* calc;
} m_value;
};
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index a254eed..10d6c90 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -1,7 +1,8 @@
/*
* Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
* Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
- * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
* Copyright (C) Research In Motion Limited 2010. All rights reserved.
*
@@ -1864,7 +1865,8 @@
case CSSValueVertical:
return RESIZE_VERTICAL;
case CSSValueAuto:
- ASSERT_NOT_REACHED(); // Depends on settings, thus should be handled by the caller.
+ // Depends on settings, thus should be handled by the caller.
+ NOTREACHED();
return RESIZE_NONE;
case CSSValueNone:
return RESIZE_NONE;
diff --git a/third_party/WebKit/Source/core/css/CSSProperty.h b/third_party/WebKit/Source/core/css/CSSProperty.h
index fcf95c5..08f90e04 100644
--- a/third_party/WebKit/Source/core/css/CSSProperty.h
+++ b/third_party/WebKit/Source/core/css/CSSProperty.h
@@ -50,14 +50,16 @@
CSSPropertyID shorthandID() const;
- uint16_t m_propertyID : 10;
- uint16_t m_isSetFromShorthand : 1;
- uint16_t
- m_indexInShorthandsVector : 2; // If this property was set as part of an ambiguous shorthand, gives the index in the shorthands vector.
- uint16_t m_important : 1;
- uint16_t
- m_implicit : 1; // Whether or not the property was set implicitly as the result of a shorthand.
- uint16_t m_inherited : 1;
+ unsigned m_propertyID : 10;
+ unsigned m_isSetFromShorthand : 1;
+ // If this property was set as part of an ambiguous shorthand, gives the index
+ // in the shorthands vector.
+ unsigned m_indexInShorthandsVector : 2;
+ unsigned m_important : 1;
+ // Whether or not the property was set implicitly as the result of a
+ // shorthand.
+ unsigned m_implicit : 1;
+ unsigned m_inherited : 1;
};
class CSSProperty {
diff --git a/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp b/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp
index c8df820..072663c 100644
--- a/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp
+++ b/third_party/WebKit/Source/core/css/CSSPropertyEquality.cpp
@@ -146,10 +146,12 @@
case CSSPropertyFloodOpacity:
return a.floodOpacity() == b.floodOpacity();
case CSSPropertyFontSize:
- // CSSPropertyFontSize: Must pass a specified size to setFontSize if Text Autosizing is enabled, but a computed size
- // if text zoom is enabled (if neither is enabled it's irrelevant as they're probably the same).
- // FIXME: Should we introduce an option to pass the computed font size here, allowing consumers to
- // enable text zoom rather than Text Autosizing? See http://crbug.com/227545.
+ // CSSPropertyFontSize: Must pass a specified size to setFontSize if Text
+ // Autosizing is enabled, but a computed size if text zoom is enabled (if
+ // neither is enabled it's irrelevant as they're probably the same).
+ // FIXME: Should we introduce an option to pass the computed font size
+ // here, allowing consumers to enable text zoom rather than Text
+ // Autosizing? See http://crbug.com/227545.
return a.specifiedFontSize() == b.specifiedFontSize();
case CSSPropertyFontSizeAdjust:
return a.fontSizeAdjust() == b.fontSizeAdjust();
diff --git a/third_party/WebKit/Source/core/css/CSSPropertySourceData.h b/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
index 3025bb7..ae549c1 100644
--- a/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
+++ b/third_party/WebKit/Source/core/css/CSSPropertySourceData.h
@@ -146,7 +146,8 @@
// Range of the selector list in the enclosing source.
SourceRange ruleHeaderRange;
- // Range of the rule body (e.g. style text for style rules) in the enclosing source.
+ // Range of the rule body (e.g. style text for style rules) in the enclosing
+ // source.
SourceRange ruleBodyRange;
// Only for CSSStyleRules.
diff --git a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
index a636675..82a86b9 100644
--- a/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSegmentedFontFace.cpp
@@ -103,8 +103,11 @@
RefPtr<SegmentedFontData>& fontData =
m_fontDataTable.add(key, nullptr).storedValue->value;
- if (fontData && fontData->numFaces())
- return fontData; // No release, we have a reference to an object in the cache which should retain the ref count it has.
+ if (fontData && fontData->numFaces()) {
+ // No release, we have a reference to an object in the cache which should
+ // retain the ref count it has.
+ return fontData;
+ }
if (!fontData)
fontData = SegmentedFontData::create();
@@ -133,8 +136,11 @@
faceFontData.release(), (*it)->cssFontFace()->ranges())));
}
}
- if (fontData->numFaces())
- return fontData; // No release, we have a reference to an object in the cache which should retain the ref count it has.
+ if (fontData->numFaces()) {
+ // No release, we have a reference to an object in the cache which should
+ // retain the ref count it has.
+ return fontData;
+ }
return nullptr;
}
diff --git a/third_party/WebKit/Source/core/css/CSSSelector.cpp b/third_party/WebKit/Source/core/css/CSSSelector.cpp
index edba664..89d13075 100644
--- a/third_party/WebKit/Source/core/css/CSSSelector.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSelector.cpp
@@ -3,7 +3,8 @@
* 1999 Waldo Bastian (bastian@kde.org)
* 2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
* 2001-2003 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
+ * reserved.
* Copyright (C) 2008 David Smith (catfish.man@gmail.com)
* Copyright (C) 2010 Google Inc. All rights reserved.
*
@@ -93,8 +94,8 @@
}
inline unsigned CSSSelector::specificityForOneSelector() const {
- // FIXME: Pseudo-elements and pseudo-classes do not have the same specificity. This function
- // isn't quite correct.
+ // FIXME: Pseudo-elements and pseudo-classes do not have the same specificity.
+ // This function isn't quite correct.
// http://www.w3.org/TR/selectors/#specificity
switch (m_match) {
case Id:
@@ -398,7 +399,8 @@
bool operator()(const NameToPseudoStruct& entry, const NameToPseudoStruct&) {
ASSERT(entry.string);
const char* key = reinterpret_cast<const char*>(m_key.characters8());
- // If strncmp returns 0, then either the keys are equal, or |m_key| sorts before |entry|.
+ // If strncmp returns 0, then either the keys are equal, or |m_key| sorts
+ // before |entry|.
return strncmp(entry.string, key, m_key.length()) < 0;
}
@@ -866,13 +868,15 @@
unsigned CSSSelector::computeLinkMatchType() const {
unsigned linkMatchType = MatchAll;
- // Determine if this selector will match a link in visited, unvisited or any state, or never.
+ // Determine if this selector will match a link in visited, unvisited or any
+ // state, or never.
// :visited never matches other elements than the innermost link element.
for (const CSSSelector* current = this; current;
current = current->tagHistory()) {
switch (current->getPseudoType()) {
case PseudoNot: {
- // :not(:visited) is equivalent to :link. Parser enforces that :not can't nest.
+ // :not(:visited) is equivalent to :link. Parser enforces that :not
+ // can't nest.
ASSERT(current->selectorList());
for (const CSSSelector* subSelector = current->selectorList()->first();
subSelector; subSelector = subSelector->tagHistory()) {
diff --git a/third_party/WebKit/Source/core/css/CSSSelector.h b/third_party/WebKit/Source/core/css/CSSSelector.h
index a573fdd1..3c0bc90 100644
--- a/third_party/WebKit/Source/core/css/CSSSelector.h
+++ b/third_party/WebKit/Source/core/css/CSSSelector.h
@@ -1,7 +1,8 @@
/*
* Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
* 1999 Waldo Bastian (bastian@kde.org)
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2013 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -33,15 +34,18 @@
// This class represents a selector for a StyleRule.
-// CSS selector representation is somewhat complicated and subtle. A representative list of selectors is
-// in CSSSelectorTest; run it in a debug build to see useful debugging output.
+// CSS selector representation is somewhat complicated and subtle. A
+// representative list of selectors is in CSSSelectorTest; run it in a debug
+// build to see useful debugging output.
//
// ** tagHistory() and relation():
//
-// Selectors are represented as a linked list of simple selectors (defined more or less according to
-// http://www.w3.org/TR/css3-selectors/#simple-selectors-dfn). The tagHistory() method returns the next
-// simple selector in the list. The relation() method returns the relationship of the current simple selector to
-// the one in tagHistory(). For example, the CSS selector .a.b #c is represented as:
+// Selectors are represented as a linked list of simple selectors (defined more
+// or less according to
+// http://www.w3.org/TR/css3-selectors/#simple-selectors-dfn). The tagHistory()
+// method returns the next simple selector in the list. The relation() method
+// returns the relationship of the current simple selector to the one in
+// tagHistory(). For example, the CSS selector .a.b #c is represented as:
//
// selectorText(): .a.b #c
// --> (relation == Descendant)
@@ -50,29 +54,37 @@
// selectorText(): .b
//
// The order of tagHistory() varies depending on the situation.
-// * Relations using combinators (http://www.w3.org/TR/css3-selectors/#combinators), such as descendant, sibling, etc., are parsed
-// right-to-left (in the example above, this is why #c is earlier in the tagHistory() chain than .a.b).
-// * SubSelector relations are parsed left-to-right in most cases (such as the .a.b example above); a counter-example is the
-// ::content pseudo-element. Most (all?) other pseudo elements and pseudo classes are parsed left-to-right.
-// * ShadowPseudo relations are parsed right-to-left. Example: summary::-webkit-details-marker is parsed as:
-// selectorText(): summary::-webkit-details-marker
-// --> (relation == ShadowPseudo)
-// selectorText(): summary
+// * Relations using combinators
+// (http://www.w3.org/TR/css3-selectors/#combinators), such as descendant,
+// sibling, etc., are parsed right-to-left (in the example above, this is why
+// #c is earlier in the tagHistory() chain than .a.b).
+// * SubSelector relations are parsed left-to-right in most cases (such as the
+// .a.b example above); a counter-example is the
+// ::content pseudo-element. Most (all?) other pseudo elements and pseudo
+// classes are parsed left-to-right.
+// * ShadowPseudo relations are parsed right-to-left. Example:
+// summary::-webkit-details-marker is parsed as: selectorText():
+// summary::-webkit-details-marker --> (relation == ShadowPseudo)
+// selectorText(): summary
//
// ** match():
//
-// The match of the current simple selector tells us the type of selector, such as class, id, tagname, or pseudo-class.
-// Inline comments in the Match enum give examples of when each type would occur.
+// The match of the current simple selector tells us the type of selector, such
+// as class, id, tagname, or pseudo-class. Inline comments in the Match enum
+// give examples of when each type would occur.
//
// ** value(), attribute():
//
-// value() tells you the value of the simple selector. For example, for class selectors, value() will tell you the class string,
-// and for id selectors it will tell you the id(). See below for the special case of attribute selectors.
+// value() tells you the value of the simple selector. For example, for class
+// selectors, value() will tell you the class string, and for id selectors it
+// will tell you the id(). See below for the special case of attribute
+// selectors.
//
// ** Attribute selectors.
//
-// Attribute selectors return the attribute name in the attribute() method. The value() method returns the value matched against
-// in case of selectors like [attr="value"].
+// Attribute selectors return the attribute name in the attribute() method. The
+// value() method returns the value matched against in case of selectors like
+// [attr="value"].
//
class CORE_EXPORT CSSSelector {
USING_FAST_MALLOC_WITH_TYPE_NAME(blink::CSSSelector);
@@ -117,7 +129,8 @@
Child, // > combinator
DirectAdjacent, // + combinator
IndirectAdjacent, // ~ combinator
- ShadowPseudo, // Special case of shadow DOM pseudo elements / shadow pseudo element
+ // Special case of shadow DOM pseudo elements / shadow pseudo element
+ ShadowPseudo,
ShadowDeep, // /deep/ combinator
ShadowSlot // slotted to <slot> element
};
@@ -226,8 +239,8 @@
static PseudoId parsePseudoId(const String&);
static PseudoId pseudoId(PseudoType);
- // Selectors are kept in an array by CSSSelectorList. The next component of the selector is
- // the next item in the array.
+ // Selectors are kept in an array by CSSSelectorList. The next component of
+ // the selector is the next item in the array.
const CSSSelector* tagHistory() const {
return m_isLastInTagHistory ? 0 : const_cast<CSSSelector*>(this + 1);
}
@@ -243,8 +256,10 @@
// http://www.w3.org/TR/css3-selectors/#attrnmsp
const QualifiedName& attribute() const;
AttributeMatchType attributeMatch() const;
- // Returns the argument of a parameterized selector. For example, :lang(en-US) would have an argument of en-US.
- // Note that :nth-* selectors don't store an argument and just store the numbers.
+ // Returns the argument of a parameterized selector. For example, :lang(en-US)
+ // would have an argument of en-US.
+ // Note that :nth-* selectors don't store an argument and just store the
+ // numbers.
const AtomicString& argument() const {
return m_hasRareData ? m_data.m_rareData->m_argument : nullAtom;
}
diff --git a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
index 5f11e89..3af0331d 100644
--- a/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSelectorList.cpp
@@ -72,7 +72,8 @@
for (size_t i = 0; i < selectorVector.size(); ++i) {
CSSParserSelector* current = selectorVector[i].get();
while (current) {
- // Move item from the parser selector vector into m_selectorArray without invoking destructor (Ugh.)
+ // Move item from the parser selector vector into m_selectorArray without
+ // invoking destructor (Ugh.)
CSSSelector* currentSelector = current->releaseSelector().release();
memcpy(&list.m_selectorArray[arrayIndex], currentSelector,
sizeof(CSSSelector));
diff --git a/third_party/WebKit/Source/core/css/CSSSelectorList.h b/third_party/WebKit/Source/core/css/CSSSelectorList.h
index 6c6f21a..ad7bc10 100644
--- a/third_party/WebKit/Source/core/css/CSSSelectorList.h
+++ b/third_party/WebKit/Source/core/css/CSSSelectorList.h
@@ -93,8 +93,9 @@
CSSSelectorList(const CSSSelectorList&) = delete;
CSSSelectorList& operator=(const CSSSelectorList&) = delete;
- // End of a multipart selector is indicated by m_isLastInTagHistory bit in the last item.
- // End of the array is indicated by m_isLastInSelectorList bit in the last item.
+ // End of a multipart selector is indicated by m_isLastInTagHistory bit in the
+ // last item. End of the array is indicated by m_isLastInSelectorList bit in
+ // the last item.
CSSSelector* m_selectorArray;
};
diff --git a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
index f6b4ef85..4bc30a0 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
+++ b/third_party/WebKit/Source/core/css/CSSStyleDeclaration.h
@@ -66,9 +66,11 @@
virtual String removeProperty(const String& propertyName,
ExceptionState&) = 0;
- // CSSPropertyID versions of the CSSOM functions to support bindings and editing.
+ // CSSPropertyID versions of the CSSOM functions to support bindings and
+ // editing.
// Use the non-virtual methods in the concrete subclasses when possible.
- // The CSSValue returned by this function should not be exposed to the web as it may be used by multiple documents at the same time.
+ // The CSSValue returned by this function should not be exposed to the web as
+ // it may be used by multiple documents at the same time.
virtual const CSSValue* getPropertyCSSValueInternal(CSSPropertyID) = 0;
virtual const CSSValue* getPropertyCSSValueInternal(
AtomicString customPropertyName) = 0;
diff --git a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
index 8e340ee..33e90d8 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
+++ b/third_party/WebKit/Source/core/css/CSSStyleSheet.cpp
@@ -175,7 +175,8 @@
return;
// Need FullStyleUpdate when insertRule or deleteRule,
- // because StyleSheetCollection::analyzeStyleSheetChange cannot detect partial rule update.
+ // because StyleSheetCollection::analyzeStyleSheetChange cannot detect partial
+ // rule update.
StyleResolverUpdateMode updateMode =
updateType != PartialRuleUpdate ? AnalyzedStyleUpdate : FullStyleUpdate;
owner->styleEngine().setNeedsActiveStyleUpdate(this, updateMode);
diff --git a/third_party/WebKit/Source/core/css/CSSStyleSheet.h b/third_party/WebKit/Source/core/css/CSSStyleSheet.h
index 6e04d4b..84e6884 100644
--- a/third_party/WebKit/Source/core/css/CSSStyleSheet.h
+++ b/third_party/WebKit/Source/core/css/CSSStyleSheet.h
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -101,7 +102,8 @@
MediaQuerySet* mediaQueries() const { return m_mediaQueries.get(); }
void setMediaQueries(MediaQuerySet*);
void setTitle(const String& title) { m_title = title; }
- // Set by LinkStyle iff CORS-enabled fetch of stylesheet succeeded from this origin.
+ // Set by LinkStyle iff CORS-enabled fetch of stylesheet succeeded from this
+ // origin.
void setAllowRuleAccessFromOrigin(PassRefPtr<SecurityOrigin> allowedOrigin);
class RuleMutationScope {
diff --git a/third_party/WebKit/Source/core/css/CSSSyntaxDescriptor.cpp b/third_party/WebKit/Source/core/css/CSSSyntaxDescriptor.cpp
index bfc2041a..22b5044 100644
--- a/third_party/WebKit/Source/core/css/CSSSyntaxDescriptor.cpp
+++ b/third_party/WebKit/Source/core/css/CSSSyntaxDescriptor.cpp
@@ -153,7 +153,8 @@
case CSSSyntaxType::Color:
return consumeColor(range, HTMLStandardMode);
case CSSSyntaxType::Image:
- // TODO(timloh): This probably needs a proper parser context for relative URL resolution.
+ // TODO(timloh): This probably needs a proper parser context for relative
+ // URL resolution.
return consumeImage(range, strictCSSParserContext());
case CSSSyntaxType::Url:
return consumeUrl(range);
diff --git a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
index 9c09b8c..0874a35 100644
--- a/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
+++ b/third_party/WebKit/Source/core/css/CSSToLengthConversionData.cpp
@@ -52,9 +52,9 @@
float CSSToLengthConversionData::FontSizes::ex() const {
ASSERT(m_font);
- // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
- // We really need to compute EX using fontMetrics for the original specifiedSize and not use
- // our actual constructed layoutObject font.
+ // FIXME: We have a bug right now where the zoom will be applied twice to EX
+ // units. We really need to compute EX using fontMetrics for the original
+ // specifiedSize and not use our actual constructed layoutObject font.
if (!m_font->getFontMetrics().hasXHeight())
return m_em / 2.0f;
return m_font->getFontMetrics().xHeight();
@@ -119,8 +119,9 @@
double value,
CSSPrimitiveValue::UnitType type) const {
// The logic in this function is duplicated in MediaValues::computeLength()
- // because MediaValues::computeLength() needs nearly identical logic, but we haven't found a way to make
- // zoomedComputedPixels() more generic (to solve both cases) without hurting performance.
+ // because MediaValues::computeLength() needs nearly identical logic, but we
+ // haven't found a way to make zoomedComputedPixels() more generic (to solve
+ // both cases) without hurting performance.
switch (type) {
case CSSPrimitiveValue::UnitType::Pixels:
case CSSPrimitiveValue::UnitType::UserUnits:
@@ -153,8 +154,9 @@
case CSSPrimitiveValue::UnitType::ViewportMax:
return value * viewportMaxPercent() * zoom();
- // We do not apply the zoom factor when we are computing the value of the font-size property. The zooming
- // for font sizes is much more complicated, since we have to worry about enforcing the minimum font size preference
+ // We do not apply the zoom factor when we are computing the value of the
+ // font-size property. The zooming for font sizes is much more complicated,
+ // since we have to worry about enforcing the minimum font size preference
// as well as enforcing the implicit "smart minimum."
case CSSPrimitiveValue::UnitType::Ems:
case CSSPrimitiveValue::UnitType::QuirkyEms:
diff --git a/third_party/WebKit/Source/core/css/CSSValueList.h b/third_party/WebKit/Source/core/css/CSSValueList.h
index dd6782c..08457fd 100644
--- a/third_party/WebKit/Source/core/css/CSSValueList.h
+++ b/third_party/WebKit/Source/core/css/CSSValueList.h
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/CSSVariableData.h b/third_party/WebKit/Source/core/css/CSSVariableData.h
index fe910cf..697c2da 100644
--- a/third_party/WebKit/Source/core/css/CSSVariableData.h
+++ b/third_party/WebKit/Source/core/css/CSSVariableData.h
@@ -56,10 +56,11 @@
bool isAnimationTainted,
bool needsVariableResolution);
- // We can safely copy the tokens (which have raw pointers to substrings) because
- // StylePropertySets contain references to CSSCustomPropertyDeclarations, which
- // point to the unresolved CSSVariableData values that own the backing strings
- // this will potentially reference.
+ // We can safely copy the tokens (which have raw pointers to substrings)
+ // because StylePropertySets contain references to
+ // CSSCustomPropertyDeclarations, which point to the unresolved
+ // CSSVariableData values that own the backing strings this will potentially
+ // reference.
CSSVariableData(const Vector<CSSParserToken>& resolvedTokens,
String backingString,
bool isAnimationTainted)
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
index e5f4ce0..f625f25 100644
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.cpp
@@ -1,6 +1,7 @@
/*
* Copyright (C) 2004 Zack Rusin <zack@kde.org>
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
* Copyright (C) 2011 Sencha, Inc. All rights reserved.
@@ -139,7 +140,8 @@
CSSValue* ComputedStyleCSSValueMapping::currentColorOrValidColor(
const ComputedStyle& style,
const StyleColor& color) {
- // This function does NOT look at visited information, so that computed style doesn't expose that.
+ // This function does NOT look at visited information, so that computed style
+ // doesn't expose that.
return CSSColorValue::create(color.resolve(style.color()).rgb());
}
@@ -161,8 +163,9 @@
}
static CSSValue* valueForFillRepeat(EFillRepeat xRepeat, EFillRepeat yRepeat) {
- // For backwards compatibility, if both values are equal, just return one of them. And
- // if the two values are equivalent to repeat-x or repeat-y, just return the shorthand.
+ // For backwards compatibility, if both values are equal, just return one of
+ // them. And if the two values are equivalent to repeat-x or repeat-y, just
+ // return the shorthand.
if (xRepeat == yRepeat)
return CSSIdentifierValue::create(xRepeat);
if (xRepeat == RepeatFill && yRepeat == NoRepeatFill)
@@ -226,11 +229,12 @@
}
if (offset.isAuto() && layoutObject) {
- // If the property applies to a positioned element and the resolved value of the display
- // property is not none, the resolved value is the used value.
+ // If the property applies to a positioned element and the resolved value of
+ // the display property is not none, the resolved value is the used value.
if (layoutObject->isInFlowPositioned()) {
- // If e.g. left is auto and right is not auto, then left's computed value is negative right.
- // So we get the opposite length unit and see if it is auto.
+ // If e.g. left is auto and right is not auto, then left's computed value
+ // is negative right. So we get the opposite length unit and see if it is
+ // auto.
if (opposite.isAuto())
return CSSPrimitiveValue::create(0,
CSSPrimitiveValue::UnitType::Pixels);
@@ -256,13 +260,15 @@
}
if (layoutObject->isOutOfFlowPositioned() && layoutObject->isBox()) {
- // For fixed and absolute positioned elements, the top, left, bottom, and right
- // are defined relative to the corresponding sides of the containing block.
+ // For fixed and absolute positioned elements, the top, left, bottom, and
+ // right are defined relative to the corresponding sides of the containing
+ // block.
LayoutBlock* container = layoutObject->containingBlock();
const LayoutBox* layoutBox = toLayoutBox(layoutObject);
- // clientOffset is the distance from this object's border edge to the container's
- // padding edge. Thus it includes margins which we subtract below.
+ // clientOffset is the distance from this object's border edge to the
+ // container's padding edge. Thus it includes margins which we subtract
+ // below.
const LayoutSize clientOffset =
layoutBox->locationOffset() -
LayoutSize(container->clientLeft(), container->clientTop());
@@ -497,7 +503,9 @@
CSSValueList* result = CSSValueList::createSpaceSeparated();
if (data.positionType() == LegacyPosition)
result->append(*CSSIdentifierValue::create(CSSValueLegacy));
- // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto' flag to not just mean 'auto' prior to running the StyleAdjuster but also mean 'normal' after running it.
+ // To avoid needing to copy the RareNonInheritedData, we repurpose the 'auto'
+ // flag to not just mean 'auto' prior to running the StyleAdjuster but also
+ // mean 'normal' after running it.
result->append(*CSSIdentifierValue::create(
data.position() == ItemPositionAuto
? ComputedStyle::initialDefaultAlignment().position()
@@ -1005,8 +1013,8 @@
bool trackListIsEmpty =
trackSizes.isEmpty() && autoRepeatTrackSizes.isEmpty();
if (isLayoutGrid && trackListIsEmpty) {
- // For grids we should consider every listed track, whether implicitly or explicitly
- // created. Empty grids have a sole grid line per axis.
+ // For grids we should consider every listed track, whether implicitly or
+ // explicitly created. Empty grids have a sole grid line per axis.
auto& positions = isRowAxis ? toLayoutGrid(layoutObject)->columnPositions()
: toLayoutGrid(layoutObject)->rowPositions();
trackListIsEmpty = positions.size() == 1;
@@ -1398,7 +1406,8 @@
ComputedStyle::ExcludeMotionPath,
ComputedStyle::ExcludeIndependentTransformProperties);
- // FIXME: Need to print out individual functions (https://bugs.webkit.org/show_bug.cgi?id=23924)
+ // FIXME: Need to print out individual functions
+ // (https://bugs.webkit.org/show_bug.cgi?id=23924)
CSSValueList* list = CSSValueList::createSpaceSeparated();
list->append(*valueForMatrixTransform(transform, style));
@@ -1791,7 +1800,8 @@
DropShadowFilterOperation* dropShadowOperation =
toDropShadowFilterOperation(filterOperation);
filterValue = CSSFunctionValue::create(CSSValueDropShadow);
- // We want our computed style to look like that of a text shadow (has neither spread nor inset style).
+ // We want our computed style to look like that of a text shadow (has
+ // neither spread nor inset style).
ShadowData shadow(dropShadowOperation->location(),
dropShadowOperation->stdDeviation(), 0, Normal,
StyleColor(dropShadowOperation->getColor()));
@@ -1818,7 +1828,8 @@
CSSValueList* list = CSSValueList::createSpaceSeparated();
list->append(*valueForFontStyle(style));
- // Check that non-initial font-variant subproperties are not conflicting with this serialization.
+ // Check that non-initial font-variant subproperties are not conflicting with
+ // this serialization.
CSSValue* ligaturesValue = valueForFontVariantLigatures(style);
CSSValue* numericValue = valueForFontVariantNumeric(style);
if (!ligaturesValue->equals(*CSSIdentifierValue::create(CSSValueNormal)) ||
@@ -2354,10 +2365,12 @@
return list;
}
- // Specs mention that getComputedStyle() should return the used value of the property instead of the computed
- // one for grid-template-{rows|columns} but not for the grid-auto-{rows|columns} as things like
- // grid-auto-columns: 2fr; cannot be resolved to a value in pixels as the '2fr' means very different things
- // depending on the size of the explicit grid or the number of implicit tracks added to the grid. See
+ // Specs mention that getComputedStyle() should return the used value of the
+ // property instead of the computed one for grid-template-{rows|columns} but
+ // not for the grid-auto-{rows|columns} as things like grid-auto-columns:
+ // 2fr; cannot be resolved to a value in pixels as the '2fr' means very
+ // different things depending on the size of the explicit grid or the number
+ // of implicit tracks added to the grid. See
// http://lists.w3.org/Archives/Public/www-style/2013Nov/0014.html
case CSSPropertyGridAutoColumns:
return valueForGridTrackSizeList(ForColumns, style);
@@ -2412,8 +2425,9 @@
case CSSPropertyHeight:
if (layoutObject) {
- // According to http://www.w3.org/TR/CSS2/visudet.html#the-height-property,
- // the "height" property does not apply for non-atomic inline elements.
+ // According to
+ // http://www.w3.org/TR/CSS2/visudet.html#the-height-property, the
+ // "height" property does not apply for non-atomic inline elements.
if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline())
return CSSIdentifierValue::create(CSSValueAuto);
return zoomAdjustedPixelValue(sizingBox(layoutObject).height(), style);
@@ -2482,9 +2496,11 @@
return zoomAdjustedPixelValueForLength(marginRight, style);
float value;
if (marginRight.isPercentOrCalc()) {
- // LayoutBox gives a marginRight() that is the distance between the right-edge of the child box
- // and the right-edge of the containing box, when display == EDisplay::Block. Let's calculate the absolute
- // value of the specified margin-right % instead of relying on LayoutBox's marginRight() value.
+ // LayoutBox gives a marginRight() that is the distance between the
+ // right-edge of the child box and the right-edge of the containing box,
+ // when display == EDisplay::Block. Let's calculate the absolute value
+ // of the specified margin-right % instead of relying on LayoutBox's
+ // marginRight() value.
value = minimumValueForLength(
marginRight, toLayoutBox(layoutObject)
->containingBlockLogicalWidthForContent())
@@ -2623,7 +2639,8 @@
return CSSIdentifierValue::create(style.position());
case CSSPropertyQuotes:
if (!style.quotes()) {
- // TODO(ramya.v): We should return the quote values that we're actually using.
+ // TODO(ramya.v): We should return the quote values that we're actually
+ // using.
return nullptr;
}
if (style.quotes()->size()) {
@@ -2767,7 +2784,8 @@
CSSPrimitiveValue::UnitType::Number);
case CSSPropertyWidth:
if (layoutObject) {
- // According to http://www.w3.org/TR/CSS2/visudet.html#the-width-property,
+ // According to
+ // http://www.w3.org/TR/CSS2/visudet.html#the-width-property,
// the "width" property does not apply for non-atomic inline elements.
if (!layoutObject->isAtomicInlineLevel() && layoutObject->isInline())
return CSSIdentifierValue::create(CSSValueAuto);
@@ -2972,7 +2990,8 @@
return style.maskBoxImageSource()->computedCSSValue();
return CSSIdentifierValue::create(CSSValueNone);
case CSSPropertyWebkitFontSizeDelta:
- // Not a real style property -- used by the editing engine -- so has no computed value.
+ // Not a real style property -- used by the editing engine -- so has no
+ // computed value.
return nullptr;
case CSSPropertyWebkitMarginBottomCollapse:
case CSSPropertyWebkitMarginAfterCollapse:
@@ -3276,7 +3295,8 @@
case CSSPropertyWebkitTextEmphasis:
return nullptr;
- // Directional properties are resolved by resolveDirectionAwareProperty() before the switch.
+ // Directional properties are resolved by resolveDirectionAwareProperty()
+ // before the switch.
case CSSPropertyWebkitBorderEnd:
case CSSPropertyWebkitBorderEndColor:
case CSSPropertyWebkitBorderEndStyle:
diff --git a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.h b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.h
index 74c5cdb..cb2fc89a 100644
--- a/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.h
+++ b/third_party/WebKit/Source/core/css/ComputedStyleCSSValueMapping.h
@@ -27,7 +27,8 @@
STATIC_ONLY(ComputedStyleCSSValueMapping);
public:
- // FIXME: Resolve computed auto alignment in applyProperty/ComputedStyle and remove this non-const styledNode parameter.
+ // FIXME: Resolve computed auto alignment in applyProperty/ComputedStyle and
+ // remove this non-const styledNode parameter.
static const CSSValue* get(CSSPropertyID,
const ComputedStyle&,
const LayoutObject* = nullptr,
diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
index 90896e9..514e8d8 100644
--- a/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
+++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -142,13 +144,15 @@
continue;
}
- // FIXME: Exposing the non-standard getMatchedCSSRules API to web is the only reason this is needed.
+ // FIXME: Exposing the non-standard getMatchedCSSRules API to web is the
+ // only reason this is needed.
if (m_sameOriginOnly && !ruleData.hasDocumentSecurityOrigin())
continue;
StyleRule* rule = ruleData.rule();
- // If the rule has no properties to apply, then ignore it in the non-debug mode.
+ // If the rule has no properties to apply, then ignore it in the non-debug
+ // mode.
const StylePropertySet& properties = rule->properties();
if (properties.isEmpty() && !m_includeEmptyRules)
continue;
@@ -198,17 +202,19 @@
if (element.isVTTElement())
collectMatchingRulesForList(matchRequest.ruleSet->cuePseudoRules(),
cascadeOrder, matchRequest);
- // Check whether other types of rules are applicable in the current tree scope. Criteria for this:
+ // Check whether other types of rules are applicable in the current tree
+ // scope. Criteria for this:
// a) the rules are UA rules.
// b) matching tree boundary crossing rules.
- // c) the rules come from a shadow style sheet in the same tree scope as the given element.
+ // c) the rules come from a shadow style sheet in the same tree scope as the
+ // given element.
// c) is checked in rulesApplicableInCurrentTreeScope.
if (!m_matchingUARules && !matchingTreeBoundaryRules &&
!rulesApplicableInCurrentTreeScope(&element, matchRequest.scope))
return;
- // We need to collect the rules for id, class, tag, and everything else into a buffer and
- // then sort the buffer.
+ // We need to collect the rules for id, class, tag, and everything else into a
+ // buffer and then sort the buffer.
if (element.hasID())
collectMatchingRulesForList(
matchRequest.ruleSet->idRules(element.idForStyleResolution()),
@@ -266,9 +272,10 @@
void ElementRuleCollector::appendCSSOMWrapperForRule(
CSSStyleSheet* parentStyleSheet,
StyleRule* rule) {
- // |parentStyleSheet| is 0 if and only if the |rule| is coming from User Agent. In this case,
- // it is safe to create CSSOM wrappers without parentStyleSheets as they will be used only
- // by inspector which will not try to edit them.
+ // |parentStyleSheet| is 0 if and only if the |rule| is coming from User
+ // Agent. In this case, it is safe to create CSSOM wrappers without
+ // parentStyleSheets as they will be used only by inspector which will not try
+ // to edit them.
CSSRule* cssRule = nullptr;
if (parentStyleSheet)
cssRule = findStyleRule(parentStyleSheet, rule);
@@ -313,8 +320,8 @@
CascadeOrder cascadeOrder,
const MatchRequest& matchRequest) {
PseudoId dynamicPseudo = result.dynamicPseudo;
- // If we're matching normal rules, set a pseudo bit if
- // we really just matched a pseudo-element.
+ // If we're matching normal rules, set a pseudo bit if we really just matched
+ // a pseudo-element.
if (dynamicPseudo != PseudoIdNone &&
m_pseudoStyleRequest.pseudoId == PseudoIdNone) {
if (m_mode == SelectorChecker::CollectingCSSRules ||
@@ -356,8 +363,8 @@
m_mode = SelectorChecker::SharingRules;
// To check whether a given RuleSet has any rule matching a given element,
- // should not see the element's treescope. Because RuleSet has no
- // information about "scope".
+ // should not see the element's treescope. Because RuleSet has no information
+ // about "scope".
MatchRequest matchRequest(ruleSet);
collectMatchingRules(matchRequest);
collectMatchingShadowHostRules(matchRequest);
diff --git a/third_party/WebKit/Source/core/css/ElementRuleCollector.h b/third_party/WebKit/Source/core/css/ElementRuleCollector.h
index 401aacc..a33d09b 100644
--- a/third_party/WebKit/Source/core/css/ElementRuleCollector.h
+++ b/third_party/WebKit/Source/core/css/ElementRuleCollector.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -40,8 +41,9 @@
class SelectorFilter;
class StaticCSSRuleList;
-// TODO(kochi): CascadeOrder is used only for Shadow DOM V0 bug-compatible cascading order.
-// Once Shadow DOM V0 implementation is gone, remove this completely.
+// TODO(kochi): CascadeOrder is used only for Shadow DOM V0 bug-compatible
+// cascading order. Once Shadow DOM V0 implementation is gone, remove this
+// completely.
using CascadeOrder = unsigned;
const CascadeOrder ignoreCascadeOrder = 0;
diff --git a/third_party/WebKit/Source/core/css/FontFace.cpp b/third_party/WebKit/Source/core/css/FontFace.cpp
index 38c4fb9..c4ece8e6 100644
--- a/third_party/WebKit/Source/core/css/FontFace.cpp
+++ b/third_party/WebKit/Source/core/css/FontFace.cpp
@@ -309,8 +309,9 @@
if (familyValue.isFontFamilyValue()) {
family = AtomicString(toCSSFontFamilyValue(familyValue).value());
} else if (familyValue.isIdentifierValue()) {
- // We need to use the raw text for all the generic family types, since @font-face is a way of actually
- // defining what font to use for those types.
+ // We need to use the raw text for all the generic family types, since
+ // @font-face is a way of actually defining what font to use for those
+ // types.
switch (toCSSIdentifierValue(familyValue).getValueID()) {
case CSSValueSerif:
family = FontFamilyNames::webkit_serif;
@@ -513,8 +514,9 @@
case CSSValue100:
weight = FontWeight100;
break;
- // Although 'lighter' and 'bolder' are valid keywords for font-weights, they are invalid
- // inside font-face rules so they are ignored. Reference: http://www.w3.org/TR/css3-fonts/#descdef-font-weight.
+ // Although 'lighter' and 'bolder' are valid keywords for font-weights,
+ // they are invalid inside font-face rules so they are ignored. Reference:
+ // http://www.w3.org/TR/css3-fonts/#descdef-font-weight.
case CSSValueLighter:
case CSSValueBolder:
break;
@@ -573,14 +575,16 @@
if (m_error)
return;
- // Each item in the src property's list is a single CSSFontFaceSource. Put them all into a CSSFontFace.
+ // Each item in the src property's list is a single CSSFontFaceSource. Put
+ // them all into a CSSFontFace.
ASSERT(src);
ASSERT(src->isValueList());
const CSSValueList* srcList = toCSSValueList(src);
int srcLength = srcList->length();
for (int i = 0; i < srcLength; i++) {
- // An item in the list either specifies a string (local font name) or a URL (remote font to download).
+ // An item in the list either specifies a string (local font name) or a URL
+ // (remote font to download).
const CSSFontFaceSrcValue& item = toCSSFontFaceSrcValue(srcList->item(i));
CSSFontFaceSource* source = nullptr;
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.cpp b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
index 709ce9d6..03f185fa 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.cpp
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.cpp
@@ -394,8 +394,8 @@
LoadFontPromiseResolver* resolver =
LoadFontPromiseResolver::create(faces, scriptState);
ScriptPromise promise = resolver->promise();
- resolver->loadFonts(
- getExecutionContext()); // After this, resolver->promise() may return null.
+ // After this, resolver->promise() may return null.
+ resolver->loadFonts(getExecutionContext());
return promise;
}
@@ -441,7 +441,8 @@
if (fontString.isEmpty())
return false;
- // Interpret fontString in the same way as the 'font' attribute of CanvasRenderingContext2D.
+ // Interpret fontString in the same way as the 'font' attribute of
+ // CanvasRenderingContext2D.
MutableStylePropertySet* parsedStyle =
MutableStylePropertySet::create(HTMLStandardMode);
CSSParser::parseValue(parsedStyle, CSSPropertyFont, fontString, true, 0);
diff --git a/third_party/WebKit/Source/core/css/FontFaceSet.h b/third_party/WebKit/Source/core/css/FontFaceSet.h
index 7e99e19..3923e880 100644
--- a/third_party/WebKit/Source/core/css/FontFaceSet.h
+++ b/third_party/WebKit/Source/core/css/FontFaceSet.h
@@ -38,7 +38,8 @@
#include "wtf/Allocator.h"
#include "wtf/Vector.h"
-// Mac OS X 10.6 SDK defines check() macro that interfares with our check() method
+// Mac OS X 10.6 SDK defines check() macro that interferes with our check()
+// method
#ifdef check
#undef check
#endif
diff --git a/third_party/WebKit/Source/core/css/FontSize.cpp b/third_party/WebKit/Source/core/css/FontSize.cpp
index 27fbe11..f77d40d 100644
--- a/third_party/WebKit/Source/core/css/FontSize.cpp
+++ b/third_party/WebKit/Source/core/css/FontSize.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -47,15 +49,17 @@
if (fabsf(specifiedSize) < std::numeric_limits<float>::epsilon())
return 0.0f;
- // We support two types of minimum font size. The first is a hard override that applies to
- // all fonts. This is "minSize." The second type of minimum font size is a "smart minimum"
- // that is applied only when the Web page can't know what size it really asked for, e.g.,
- // when it uses logical sizes like "small" or expresses the font-size as a percentage of
- // the user's default font setting.
+ // We support two types of minimum font size. The first is a hard override
+ // that applies to all fonts. This is "minSize." The second type of minimum
+ // font size is a "smart minimum" that is applied only when the Web page can't
+ // know what size it really asked for, e.g., when it uses logical sizes like
+ // "small" or expresses the font-size as a percentage of the user's default
+ // font setting.
- // With the smart minimum, we never want to get smaller than the minimum font size to keep fonts readable.
- // However we always allow the page to set an explicit pixel size that is smaller,
- // since sites will mis-render otherwise (e.g., http://www.gamespot.com with a 9px minimum).
+ // With the smart minimum, we never want to get smaller than the minimum font
+ // size to keep fonts readable. However we always allow the page to set an
+ // explicit pixel size that is smaller, since sites will mis-render otherwise
+ // (e.g., http://www.gamespot.com with a 9px minimum).
Settings* settings = document->settings();
if (!settings)
@@ -65,20 +69,22 @@
int minLogicalSize = settings->minimumLogicalFontSize();
float zoomedSize = specifiedSize * zoomFactor;
- // Apply the hard minimum first. We only apply the hard minimum if after zooming we're still too small.
+ // Apply the hard minimum first. We only apply the hard minimum if after
+ // zooming we're still too small.
if (zoomedSize < minSize)
zoomedSize = minSize;
- // Now apply the "smart minimum." This minimum is also only applied if we're still too small
- // after zooming. The font size must either be relative to the user default or the original size
- // must have been acceptable. In other words, we only apply the smart minimum whenever we're positive
- // doing so won't disrupt the layout.
+ // Now apply the "smart minimum." This minimum is also only applied if we're
+ // still too small after zooming. The font size must either be relative to the
+ // user default or the original size must have been acceptable. In other
+ // words, we only apply the smart minimum whenever we're positive doing so
+ // won't disrupt the layout.
if (useSmartMinimumForFontSize && zoomedSize < minLogicalSize &&
(specifiedSize >= minLogicalSize || !isAbsoluteSize))
zoomedSize = minLogicalSize;
- // Also clamp to a reasonable maximum to prevent insane font sizes from causing crashes on various
- // platforms (I'm looking at you, Windows.)
+ // Also clamp to a reasonable maximum to prevent insane font sizes from
+ // causing crashes on various platforms (I'm looking at you, Windows.)
return std::min(maximumAllowedFontSize, zoomedSize);
}
@@ -86,7 +92,8 @@
const int fontSizeTableMin = 9;
const int totalKeywords = 8;
-// WinIE/Nav4 table for font sizes. Designed to match the legacy font mapping system of HTML.
+// WinIE/Nav4 table for font sizes. Designed to match the legacy font mapping
+// system of HTML.
static const int quirksFontSizeTable[fontSizeTableMax - fontSizeTableMin +
1][totalKeywords] = {
{9, 9, 9, 9, 11, 14, 18, 28}, {9, 9, 9, 10, 12, 15, 20, 31},
@@ -114,8 +121,8 @@
// |
// user pref
-// For values outside the range of the table, we use Todd Fahrner's suggested scale
-// factors for each keyword value.
+// For values outside the range of the table, we use Todd Fahrner's suggested
+// scale factors for each keyword value.
static const float fontSizeFactors[totalKeywords] = {0.60f, 0.75f, 0.89f, 1.0f,
1.2f, 1.5f, 2.0f, 3.0f};
@@ -157,7 +164,8 @@
static int findNearestLegacyFontSize(int pixelFontSize,
const T* table,
int multiplier) {
- // Ignore table[0] because xx-small does not correspond to any legacy font size.
+ // Ignore table[0] because xx-small does not correspond to any legacy font
+ // size.
for (int i = 1; i < totalKeywords - 1; i++) {
if (pixelFontSize * 2 < (table[i] + table[i + 1]) * multiplier)
return i;
diff --git a/third_party/WebKit/Source/core/css/FontSize.h b/third_party/WebKit/Source/core/css/FontSize.h
index ea7c989..d8c9d5b 100644
--- a/third_party/WebKit/Source/core/css/FontSize.h
+++ b/third_party/WebKit/Source/core/css/FontSize.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -45,7 +46,8 @@
float specifiedSize,
ESmartMinimumForFontSize = UseSmartMinimumForFontSize);
- // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this function returns
+ // Given a CSS keyword in the range (xx-small to -webkit-xxx-large), this
+ // function returns
// values from '1' to '8'.
static unsigned keywordSize(CSSValueID valueID) {
ASSERT(isValidValueID(valueID));
@@ -65,7 +67,8 @@
unsigned keyword,
bool isMonospace);
- // Given a font size in pixel, this function will return legacy font size between 1 and 7.
+ // Given a font size in pixel, this function will return legacy font size
+ // between 1 and 7.
static int legacyFontSize(const Document*,
int pixelFontSize,
bool isMonospace);
diff --git a/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp b/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp
index 9612345..f3cddeb 100644
--- a/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp
+++ b/third_party/WebKit/Source/core/css/FontStyleMatcher.cpp
@@ -42,14 +42,19 @@
static_assert(FontStyleNormal == 0 && FontStyleItalic == 2,
"Enumeration values need to match lookup table.");
unsigned styleScoreLookupTable[][FontStyleItalic + 1] = {
- // "If the value is normal, normal faces are checked first, then oblique faces, then italic faces."
+ // "If the value is normal, normal faces are checked first, then oblique
+ // faces, then italic faces."
// i.e. normal has the highest score, then oblique, then italic.
{2, 1, 0},
- // "If the value is oblique, oblique faces are checked first, then italic faces and then normal faces."
- // i.e. normal gets the lowest score, oblique gets the highest, italic second best.
+ // "If the value is oblique, oblique faces are checked first, then italic
+ // faces and then normal faces."
+ // i.e. normal gets the lowest score, oblique gets the highest, italic
+ // second best.
{0, 2, 1},
- // "If the value of font-style is italic, italic faces are checked first, then oblique, then normal faces"
- // i.e. normal gets the lowest score, oblique is second best, italic highest.
+ // "If the value of font-style is italic, italic faces are checked first,
+ // then oblique, then normal faces"
+ // i.e. normal gets the lowest score, oblique is second best, italic
+ // highest.
{0, 1, 2}};
ASSERT_WITH_SECURITY_IMPLICATION(desired.style() < FontStyleItalic + 1);
@@ -102,7 +107,8 @@
const FontTraits& candidateTraits = candidate->traits();
const FontTraits& currentTraits = current->traits();
- // According to CSS3 Fonts Font Style matching, there is a precedence for matching:
+ // According to CSS3 Fonts Font Style matching, there is a precedence for
+ // matching:
// A better stretch match wins over a better style match, a better style match
// wins over a better weight match, where "better" means closer to the desired
// traits.
diff --git a/third_party/WebKit/Source/core/css/HashTools.h b/third_party/WebKit/Source/core/css/HashTools.h
index a93b9f0..5408a36 100644
--- a/third_party/WebKit/Source/core/css/HashTools.h
+++ b/third_party/WebKit/Source/core/css/HashTools.h
@@ -1,5 +1,6 @@
/*
- * Copyright (C) 2010 Andras Becsi <abecsi@inf.u-szeged.hu>, University of Szeged
+ * Copyright (C) 2010 Andras Becsi <abecsi@inf.u-szeged.hu>, University of
+ * Szeged
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp b/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp
index cda351d..f1bc448 100644
--- a/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp
+++ b/third_party/WebKit/Source/core/css/LocalFontFaceSource.cpp
@@ -19,7 +19,8 @@
PassRefPtr<SimpleFontData> LocalFontFaceSource::createFontData(
const FontDescription& fontDescription) {
- // We don't want to check alternate font family names here, so pass true as the checkingAlternateName parameter.
+ // We don't want to check alternate font family names here, so pass true as
+ // the checkingAlternateName parameter.
RefPtr<SimpleFontData> fontData =
FontCache::fontCache()->getFontData(fontDescription, m_fontName, true);
m_histograms.record(fontData.get());
diff --git a/third_party/WebKit/Source/core/css/MediaList.cpp b/third_party/WebKit/Source/core/css/MediaList.cpp
index abeb758..e3adde8 100644
--- a/third_party/WebKit/Source/core/css/MediaList.cpp
+++ b/third_party/WebKit/Source/core/css/MediaList.cpp
@@ -29,21 +29,22 @@
namespace blink {
-/* MediaList is used to store 3 types of media related entities which mean the same:
+/* MediaList is used to store 3 types of media related entities which mean the
+ * same:
*
* Media Queries, Media Types and Media Descriptors.
*
- * Media queries, as described in the Media Queries Level 3 specification, build on
- * the mechanism outlined in HTML4. The syntax of media queries fit into the media
- * type syntax reserved in HTML4. The media attribute of HTML4 also exists in XHTML
- * and generic XML. The same syntax can also be used inside the @media and @import
- * rules of CSS.
+ * Media queries, as described in the Media Queries Level 3 specification, build
+ * on the mechanism outlined in HTML4. The syntax of media queries fit into the
+ * media type syntax reserved in HTML4. The media attribute of HTML4 also exists
+ * in XHTML and generic XML. The same syntax can also be used inside the @media
+ * and @import rules of CSS.
*
- * However, the parsing rules for media queries are incompatible with those of HTML4
- * and are consistent with those of media queries used in CSS.
+ * However, the parsing rules for media queries are incompatible with those of
+ * HTML4 and are consistent with those of media queries used in CSS.
*
- * HTML5 (at the moment of writing still work in progress) references the Media Queries
- * specification directly and thus updates the rules for HTML.
+ * HTML5 (at the moment of writing still work in progress) references the Media
+ * Queries specification directly and thus updates the rules for HTML.
*
* CSS 2.1 Spec (http://www.w3.org/TR/CSS21/media.html)
* CSS 3 Media Queries Spec (http://www.w3.org/TR/css3-mediaqueries/)
@@ -149,8 +150,10 @@
}
DEFINE_TRACE(MediaQuerySet) {
- // We don't support tracing of vectors of OwnPtrs (ie. std::unique_ptr<Vector<std::unique_ptr<MediaQuery>>>).
- // Since this is a transitional object we are just ifdef'ing it out when oilpan is not enabled.
+ // We don't support tracing of vectors of OwnPtrs (ie.
+ // std::unique_ptr<Vector<std::unique_ptr<MediaQuery>>>).
+ // Since this is a transitional object we are just ifdef'ing it out when
+ // oilpan is not enabled.
visitor->trace(m_queries);
}
diff --git a/third_party/WebKit/Source/core/css/MediaList.h b/third_party/WebKit/Source/core/css/MediaList.h
index f21952b..49af85a 100644
--- a/third_party/WebKit/Source/core/css/MediaList.h
+++ b/third_party/WebKit/Source/core/css/MediaList.h
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -105,7 +106,8 @@
Member<MediaQuerySet> m_mediaQueries;
// Cleared in ~CSSStyleSheet destructor when oilpan is not enabled.
Member<CSSStyleSheet> m_parentStyleSheet;
- // Cleared in the ~CSSMediaRule and ~CSSImportRule destructors when oilpan is not enabled.
+ // Cleared in the ~CSSMediaRule and ~CSSImportRule destructors when oilpan is
+ // not enabled.
Member<CSSRule> m_parentRule;
};
diff --git a/third_party/WebKit/Source/core/css/MediaQuery.cpp b/third_party/WebKit/Source/core/css/MediaQuery.cpp
index 2d304996..7ebe1b6 100644
--- a/third_party/WebKit/Source/core/css/MediaQuery.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQuery.cpp
@@ -131,8 +131,10 @@
}
DEFINE_TRACE(MediaQuery) {
- // We don't support tracing of vectors of OwnPtrs (ie. std::unique_ptr<Vector<std::unique_ptr<MediaQuery>>>).
- // Since this is a transitional object we are just ifdef'ing it out when oilpan is not enabled.
+ // We don't support tracing of vectors of OwnPtrs (ie.
+ // std::unique_ptr<Vector<std::unique_ptr<MediaQuery>>>).
+ // Since this is a transitional object we are just ifdef'ing it out when
+ // oilpan is not enabled.
visitor->trace(m_expressions);
}
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
index c691af0..4ade9dae 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.cpp
@@ -116,7 +116,8 @@
return applyRestrictor(query->restrictor(), false);
const ExpressionHeapVector& expressions = query->expressions();
- // Iterate through expressions, stop if any of them eval to false (AND semantics).
+ // Iterate through expressions, stop if any of them eval to false (AND
+ // semantics).
size_t i = 0;
for (; i < expressions.size(); ++i) {
bool exprResult = eval(expressions.at(i).get());
@@ -216,12 +217,14 @@
static bool colorIndexMediaFeatureEval(const MediaQueryExpValue& value,
MediaFeaturePrefix op,
const MediaValues&) {
- // FIXME: We currently assume that we do not support indexed displays, as it is unknown
- // how to retrieve the information if the display mode is indexed. This matches Firefox.
+ // FIXME: We currently assume that we do not support indexed displays, as it
+ // is unknown how to retrieve the information if the display mode is indexed.
+ // This matches Firefox.
if (!value.isValid())
return false;
- // Acording to spec, if the device does not use a color lookup table, the value is zero.
+ // Acording to spec, if the device does not use a color lookup table, the
+ // value is zero.
float number;
return numberValue(value, number) &&
compareValue(0, static_cast<int>(number), op);
@@ -245,8 +248,9 @@
static bool displayModeMediaFeatureEval(const MediaQueryExpValue& value,
MediaFeaturePrefix,
const MediaValues& mediaValues) {
- // isValid() is false if there is no parameter. Without parameter we should return true to indicate that
- // displayModeMediaFeature is enabled in the browser.
+ // isValid() is false if there is no parameter. Without parameter we should
+ // return true to indicate that displayModeMediaFeature is enabled in the
+ // browser.
if (!value.isValid())
return true;
@@ -313,7 +317,8 @@
MediaFeaturePrefix op,
const MediaValues& mediaValues) {
// According to MQ4, only 'screen', 'print' and 'speech' may match.
- // FIXME: What should speech match? https://www.w3.org/Style/CSS/Tracker/issues/348
+ // FIXME: What should speech match?
+ // https://www.w3.org/Style/CSS/Tracker/issues/348
float actualResolution = 0;
// This checks the actual media type applied to the document, and we know
@@ -459,7 +464,8 @@
return width;
}
-// Rest of the functions are trampolines which set the prefix according to the media feature expression used.
+// Rest of the functions are trampolines which set the prefix according to the
+// media feature expression used.
static bool minColorMediaFeatureEval(const MediaQueryExpValue& value,
MediaFeaturePrefix,
diff --git a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
index 8e61df2..695117e 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
+++ b/third_party/WebKit/Source/core/css/MediaQueryEvaluator.h
@@ -50,8 +50,8 @@
// right after parsing.
//
// the boolean parameter is used to approximate results of evaluation, if
-// the device characteristics are not known. This can be used to prune the loading
-// of stylesheets to only those which are probable to match.
+// the device characteristics are not known. This can be used to prune the
+// loading of stylesheets to only those which are probable to match.
class CORE_EXPORT MediaQueryEvaluator final
: public GarbageCollectedFinalized<MediaQueryEvaluator> {
@@ -67,8 +67,8 @@
explicit MediaQueryEvaluator(bool mediaFeatureResult = false);
// Creates evaluator which evaluates only simple media queries
- // Evaluator returns true for acceptedMediaType and returns value of \mediafeatureResult
- // for any media features.
+ // Evaluator returns true for acceptedMediaType and returns value of
+ // \mediafeatureResult for any media features.
MediaQueryEvaluator(const char* acceptedMediaType,
bool mediaFeatureResult = false);
@@ -76,7 +76,8 @@
// Creates evaluator which evaluates full media queries.
explicit MediaQueryEvaluator(LocalFrame*);
- // Creates evaluator which evaluates in a thread-safe manner a subset of media values.
+ // Creates evaluator which evaluates in a thread-safe manner a subset of media
+ // values.
explicit MediaQueryEvaluator(const MediaValues&);
~MediaQueryEvaluator();
diff --git a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
index c40e9e6f..4db0f3b 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
@@ -225,11 +225,13 @@
expValue.isID = true;
} else if (token.type() == NumberToken || token.type() == PercentageToken ||
token.type() == DimensionToken) {
- // Check for numeric token types since it is only safe for these types to call numericValue.
+ // Check for numeric token types since it is only safe for these types to
+ // call numericValue.
if (featureWithValidDensity(lowerMediaFeature, token) ||
featureWithValidPositiveLength(lowerMediaFeature, token)) {
- // Media features that must have non-negative <density>, ie. dppx, dpi or dpcm,
- // or Media features that must have non-negative <length> or number value.
+ // Media features that must have non-negative <density>, ie. dppx, dpi
+ // or dpcm, or Media features that must have non-negative <length> or
+ // number value.
expValue.value = token.numericValue();
expValue.unit = token.unitType();
expValue.isValue = true;
diff --git a/third_party/WebKit/Source/core/css/MediaQueryList.h b/third_party/WebKit/Source/core/css/MediaQueryList.h
index 08184d4..8a0d6ba 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryList.h
+++ b/third_party/WebKit/Source/core/css/MediaQueryList.h
@@ -35,10 +35,11 @@
class MediaQueryMatcher;
class MediaQuerySet;
-// MediaQueryList interface is specified at http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface
-// The objects of this class are returned by window.matchMedia. They may be used to
-// retrieve the current value of the given media query and to add/remove listeners that
-// will be called whenever the value of the query changes.
+// MediaQueryList interface is specified at
+// http://dev.w3.org/csswg/cssom-view/#the-mediaquerylist-interface
+// The objects of this class are returned by window.matchMedia. They may be used
+// to retrieve the current value of the given media query and to add/remove
+// listeners that will be called whenever the value of the query changes.
class CORE_EXPORT MediaQueryList final : public EventTargetWithInlineData,
public ActiveScriptWrappable,
@@ -63,7 +64,8 @@
void addDeprecatedListener(EventListener*);
void removeDeprecatedListener(EventListener*);
- // C++ code can use these functions to listen to changes instead of having to use DOM event listeners.
+ // C++ code can use these functions to listen to changes instead of having to
+ // use DOM event listeners.
void addListener(MediaQueryListListener*);
void removeListener(MediaQueryListListener*);
diff --git a/third_party/WebKit/Source/core/css/MediaQueryMatcher.h b/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
index 41ddd31..da0d7d0 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
+++ b/third_party/WebKit/Source/core/css/MediaQueryMatcher.h
@@ -33,9 +33,10 @@
class MediaQuerySet;
// MediaQueryMatcher class is responsible for keeping a vector of pairs
-// MediaQueryList x MediaQueryListListener. It is responsible for evaluating the queries
-// whenever it is needed and to call the listeners if the corresponding query has changed.
-// The listeners must be called in the very same order in which they have been added.
+// MediaQueryList x MediaQueryListListener. It is responsible for evaluating the
+// queries whenever it is needed and to call the listeners if the corresponding
+// query has changed. The listeners must be called in the very same order in
+// which they have been added.
class CORE_EXPORT MediaQueryMatcher final
: public GarbageCollectedFinalized<MediaQueryMatcher> {
diff --git a/third_party/WebKit/Source/core/css/MediaValues.cpp b/third_party/WebKit/Source/core/css/MediaValues.cpp
index b045fd4..298802c 100644
--- a/third_party/WebKit/Source/core/css/MediaValues.cpp
+++ b/third_party/WebKit/Source/core/css/MediaValues.cpp
@@ -146,11 +146,13 @@
double viewportWidth,
double viewportHeight,
double& result) {
- // The logic in this function is duplicated from CSSToLengthConversionData::zoomedComputedPixels()
- // because MediaValues::computeLength() needs nearly identical logic, but we haven't found a way to make
- // CSSToLengthConversionData::zoomedComputedPixels() more generic (to solve both cases) without hurting performance.
-
- // FIXME - Unite the logic here with CSSToLengthConversionData in a performant way.
+ // The logic in this function is duplicated from
+ // CSSToLengthConversionData::zoomedComputedPixels() because
+ // MediaValues::computeLength() needs nearly identical logic, but we haven't
+ // found a way to make CSSToLengthConversionData::zoomedComputedPixels() more
+ // generic (to solve both cases) without hurting performance.
+ // FIXME - Unite the logic here with CSSToLengthConversionData in a performant
+ // way.
switch (type) {
case CSSPrimitiveValue::UnitType::Ems:
case CSSPrimitiveValue::UnitType::Rems:
@@ -161,10 +163,12 @@
result = value;
return true;
case CSSPrimitiveValue::UnitType::Exs:
- // FIXME: We have a bug right now where the zoom will be applied twice to EX units.
+ // FIXME: We have a bug right now where the zoom will be applied twice to EX
+ // units.
case CSSPrimitiveValue::UnitType::Chs:
// FIXME: We don't seem to be able to cache fontMetrics related values.
- // Trying to access them is triggering some sort of microtask. Serving the spec's default instead.
+ // Trying to access them is triggering some sort of microtask. Serving the
+ // spec's default instead.
result = (value * defaultFontSize) / 2.0;
return true;
case CSSPrimitiveValue::UnitType::ViewportWidth:
diff --git a/third_party/WebKit/Source/core/css/MediaValuesCached.cpp b/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
index 481c282..3e7a806 100644
--- a/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
+++ b/third_party/WebKit/Source/core/css/MediaValuesCached.cpp
@@ -22,8 +22,10 @@
if (frame && frame->view()) {
ASSERT(frame->document() && !frame->document()->layoutViewItem().isNull());
- // In case that frame is missing (e.g. for images that their document does not have a frame)
- // We simply leave the MediaValues object with the default MediaValuesCachedData values.
+ // In case that frame is missing (e.g. for images that their document does
+ // not have a frame)
+ // We simply leave the MediaValues object with the default
+ // MediaValuesCachedData values.
viewportWidth = MediaValues::calculateViewportWidth(frame);
viewportHeight = MediaValues::calculateViewportHeight(frame);
deviceWidth = MediaValues::calculateDeviceWidth(frame);
diff --git a/third_party/WebKit/Source/core/css/MediaValuesCached.h b/third_party/WebKit/Source/core/css/MediaValuesCached.h
index 1bcfc59..2e2bbc8 100644
--- a/third_party/WebKit/Source/core/css/MediaValuesCached.h
+++ b/third_party/WebKit/Source/core/css/MediaValuesCached.h
@@ -14,7 +14,8 @@
public:
struct MediaValuesCachedData final {
DISALLOW_NEW();
- // Members variables must be thread safe, since they're copied to the parser thread
+ // Members variables must be thread safe, since they're copied to the parser
+ // thread
double viewportWidth;
double viewportHeight;
int deviceWidth;
diff --git a/third_party/WebKit/Source/core/css/MediaValuesDynamic.h b/third_party/WebKit/Source/core/css/MediaValuesDynamic.h
index 8e3a9a0..7369bc1 100644
--- a/third_party/WebKit/Source/core/css/MediaValuesDynamic.h
+++ b/third_party/WebKit/Source/core/css/MediaValuesDynamic.h
@@ -51,8 +51,8 @@
double viewportWidth,
double viewportHeight);
- // This raw ptr is safe, as MediaValues would not outlive MediaQueryEvaluator, and
- // MediaQueryEvaluator is reset on |Document::detachLayoutTree|.
+ // This raw ptr is safe, as MediaValues would not outlive MediaQueryEvaluator,
+ // and MediaQueryEvaluator is reset on |Document::detachLayoutTree|.
Member<LocalFrame> m_frame;
bool m_viewportDimensionsOverridden;
double m_viewportWidthOverride;
diff --git a/third_party/WebKit/Source/core/css/PageRuleCollector.cpp b/third_party/WebKit/Source/core/css/PageRuleCollector.cpp
index 872c708..9ed22ec7 100644
--- a/third_party/WebKit/Source/core/css/PageRuleCollector.cpp
+++ b/third_party/WebKit/Source/core/css/PageRuleCollector.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -51,7 +53,8 @@
}
bool PageRuleCollector::isFirstPage(int pageIndex) const {
- // FIXME: In case of forced left/right page, page at index 1 (not 0) can be the first page.
+ // FIXME: In case of forced left/right page, page at index 1 (not 0) can be
+ // the first page.
return (!pageIndex);
}
diff --git a/third_party/WebKit/Source/core/css/PageRuleCollector.h b/third_party/WebKit/Source/core/css/PageRuleCollector.h
index 265dba0..03aa58db 100644
--- a/third_party/WebKit/Source/core/css/PageRuleCollector.h
+++ b/third_party/WebKit/Source/core/css/PageRuleCollector.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/PropertyRegistration.cpp b/third_party/WebKit/Source/core/css/PropertyRegistration.cpp
index 7c3d5494..b672584 100644
--- a/third_party/WebKit/Source/core/css/PropertyRegistration.cpp
+++ b/third_party/WebKit/Source/core/css/PropertyRegistration.cpp
@@ -50,7 +50,8 @@
return true;
}
- // TODO(timloh): Images and transform-function values can also contain lengths.
+ // TODO(timloh): Images and transform-function values can also contain
+ // lengths.
return true;
}
diff --git a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
index 91429e4..cdbb9d1 100644
--- a/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
+++ b/third_party/WebKit/Source/core/css/PropertySetCSSStyleDeclaration.cpp
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2011 Research In Motion Limited. All rights reserved.
*
* This library is free software; you can redistribute it and/or
@@ -353,7 +354,8 @@
}
void StyleRuleCSSStyleDeclaration::didMutate(MutationType type) {
- // Style sheet mutation needs to be signaled even if the change failed. willMutateRules/didMutateRules must pair.
+ // Style sheet mutation needs to be signaled even if the change failed.
+ // willMutateRules/didMutateRules must pair.
if (m_parentRule && m_parentRule->parentStyleSheet())
m_parentRule->parentStyleSheet()->didMutateRules();
}
diff --git a/third_party/WebKit/Source/core/css/PseudoStyleRequest.h b/third_party/WebKit/Source/core/css/PseudoStyleRequest.h
index 7b605f4..d034a30 100644
--- a/third_party/WebKit/Source/core/css/PseudoStyleRequest.h
+++ b/third_party/WebKit/Source/core/css/PseudoStyleRequest.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
index 2a8eca4..fb76fee 100644
--- a/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
+++ b/third_party/WebKit/Source/core/css/RemoteFontFaceSource.h
@@ -65,7 +65,8 @@
DISALLOW_NEW();
public:
- // Should not change following order in CacheHitMetrics to be used for metrics values.
+ // Should not change following order in CacheHitMetrics to be used for
+ // metrics values.
enum CacheHitMetrics { Miss, DiskHit, DataUrl, MemoryHit, CacheHitEnumMax };
enum DataSource {
FromUnknown,
diff --git a/third_party/WebKit/Source/core/css/RuleFeature.cpp b/third_party/WebKit/Source/core/css/RuleFeature.cpp
index 4ef7fca..b9d4daa 100644
--- a/third_party/WebKit/Source/core/css/RuleFeature.cpp
+++ b/third_party/WebKit/Source/core/css/RuleFeature.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -66,7 +68,8 @@
NOTREACHED();
return false;
default:
- // New match type added. Figure out if it needs a subtree invalidation or not.
+ // New match type added. Figure out if it needs a subtree invalidation or
+ // not.
NOTREACHED();
return false;
}
@@ -161,7 +164,8 @@
NOTREACHED();
return false;
default:
- // New pseudo type added. Figure out if it needs a subtree invalidation or not.
+ // New pseudo type added. Figure out if it needs a subtree invalidation or
+ // not.
NOTREACHED();
return false;
}
@@ -626,14 +630,16 @@
}
}
-// Add features extracted from the rightmost compound selector to descendant invalidation
-// sets for features found in other compound selectors.
+// Add features extracted from the rightmost compound selector to descendant
+// invalidation sets for features found in other compound selectors.
//
-// We use descendant invalidation for descendants, sibling invalidation for siblings and their subtrees.
+// We use descendant invalidation for descendants, sibling invalidation for
+// siblings and their subtrees.
//
-// As we encounter a descendant type of combinator, the features only need to be checked
-// against descendants in the same subtree only. features.adjacent is set to false, and
-// we start adding features to the descendant invalidation set.
+// As we encounter a descendant type of combinator, the features only need to be
+// checked against descendants in the same subtree only. features.adjacent is
+// set to false, and we start adding features to the descendant invalidation
+// set.
void RuleFeatureSet::addFeaturesToInvalidationSet(
InvalidationSet& invalidationSet,
@@ -757,8 +763,9 @@
const CSSSelector& selector,
InvalidationSetFeatures* siblingFeatures,
InvalidationSetFeatures& descendantFeatures) {
- // selector is the selector immediately to the left of the rightmost combinator.
- // descendantFeatures has the features of the rightmost compound selector.
+ // selector is the selector immediately to the left of the rightmost
+ // combinator. descendantFeatures has the features of the rightmost compound
+ // selector.
InvalidationSetFeatures lastCompoundInSiblingChainFeatures;
const CSSSelector* compound = &selector;
diff --git a/third_party/WebKit/Source/core/css/RuleFeature.h b/third_party/WebKit/Source/core/css/RuleFeature.h
index 19aec44..8afa230 100644
--- a/third_party/WebKit/Source/core/css/RuleFeature.h
+++ b/third_party/WebKit/Source/core/css/RuleFeature.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -149,8 +150,10 @@
InvalidationType);
private:
- // Each map entry is either a DescendantInvalidationSet or SiblingInvalidationSet.
- // When both are needed, we store the SiblingInvalidationSet, and use it to hold the DescendantInvalidationSet.
+ // Each map entry is either a DescendantInvalidationSet or
+ // SiblingInvalidationSet.
+ // When both are needed, we store the SiblingInvalidationSet, and use it to
+ // hold the DescendantInvalidationSet.
using InvalidationSetMap = HashMap<AtomicString, RefPtr<InvalidationSet>>;
using PseudoTypeInvalidationSetMap =
HashMap<CSSSelector::PseudoType,
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
index b8590af..29798f1 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -73,7 +75,8 @@
static bool containsUncommonAttributeSelector(const CSSSelector& selector) {
const CSSSelector* current = &selector;
for (; current; current = current->tagHistory()) {
- // Allow certain common attributes (used in the default style) in the selectors that match the current element.
+ // Allow certain common attributes (used in the default style) in the
+ // selectors that match the current element.
if (current->isAttributeSelector() &&
!isCommonAttributeSelectorAttribute(current->attribute()))
return true;
@@ -195,9 +198,10 @@
return true;
}
if (!customPseudoElementName.isEmpty()) {
- // Custom pseudos come before ids and classes in the order of tagHistory, and have a relation of
- // ShadowPseudo between them. Therefore we should never be a situation where extractValuesforSelector
- // finsd id and className in addition to custom pseudo.
+ // Custom pseudos come before ids and classes in the order of tagHistory,
+ // and have a relation of ShadowPseudo between them. Therefore we should
+ // never be a situation where extractValuesforSelector finsd id and
+ // className in addition to custom pseudo.
ASSERT(id.isEmpty() && className.isEmpty());
addToRuleSet(customPseudoElementName,
ensurePendingRules()->shadowPseudoElementRules, ruleData);
@@ -242,7 +246,8 @@
return;
if (!findBestRuleSetAndAdd(ruleData.selector(), ruleData)) {
- // If we didn't find a specialized map to stick it in, file under universal rules.
+ // If we didn't find a specialized map to stick it in, file under universal
+ // rules.
m_universalRules.append(ruleData);
}
}
diff --git a/third_party/WebKit/Source/core/css/RuleSet.h b/third_party/WebKit/Source/core/css/RuleSet.h
index f5b8097..1e5df41 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.h
+++ b/third_party/WebKit/Source/core/css/RuleSet.h
@@ -1,6 +1,7 @@
/*
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc.
+ * All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -100,7 +101,8 @@
? PropertyWhitelistNone
: static_cast<PropertyWhitelistType>(m_propertyWhitelist);
}
- // Try to balance between memory usage (there can be lots of RuleData objects) and good filtering performance.
+ // Try to balance between memory usage (there can be lots of RuleData objects)
+ // and good filtering performance.
static const unsigned maximumIdentifierCount = 4;
const unsigned* descendantSelectorIdentifierHashes() const {
return m_descendantSelectorIdentifierHashes;
@@ -111,10 +113,10 @@
private:
Member<StyleRule> m_rule;
unsigned m_selectorIndex : 13;
- unsigned
- m_isLastInArray : 1; // We store an array of RuleData objects in a primitive array.
- // This number was picked fairly arbitrarily. We can probably lower it if we need to.
- // Some simple testing showed <100,000 RuleData's on large sites.
+ // We store an array of RuleData objects in a primitive array.
+ unsigned m_isLastInArray : 1;
+ // This number was picked fairly arbitrarily. We can probably lower it if we
+ // need to. Some simple testing showed <100,000 RuleData's on large sites.
unsigned m_position : 18;
unsigned m_specificity : 24;
unsigned m_containsUncommonAttributeSelector : 1;
diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.cpp b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
index a0b8e04..ab8e81d6 100644
--- a/third_party/WebKit/Source/core/css/SelectorChecker.cpp
+++ b/third_party/WebKit/Source/core/css/SelectorChecker.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
*
@@ -102,9 +104,10 @@
static Element* parentElement(
const SelectorChecker::SelectorCheckingContext& context) {
// - If context.scope is a shadow root, we should walk up to its shadow host.
- // - If context.scope is some element in some shadow tree and querySelector initialized the context,
- // e.g. shadowRoot.querySelector(':host *'),
- // (a) context.element has the same treescope as context.scope, need to walk up to its shadow host.
+ // - If context.scope is some element in some shadow tree and querySelector
+ // initialized the context, e.g. shadowRoot.querySelector(':host *'),
+ // (a) context.element has the same treescope as context.scope, need to walk
+ // up to its shadow host.
// (b) Otherwise, should not walk up from a shadow root to a shadow host.
if (context.scope &&
(context.scope == context.element->containingShadowRoot() ||
@@ -136,9 +139,9 @@
if (context.scope->treeScope() == context.element->treeScope())
return true;
- // Because Blink treats a shadow host's TreeScope as a separate one from its descendent shadow roots,
- // if the last matched element is a shadow host, the condition above isn't met, even though it
- // should be.
+ // Because Blink treats a shadow host's TreeScope as a separate one from its
+ // descendent shadow roots, if the last matched element is a shadow host, the
+ // condition above isn't met, even though it should be.
return context.element == context.scope->ownerShadowHost() &&
(!context.previousElement ||
context.previousElement->isInDescendantTreeOf(context.element));
@@ -154,9 +157,9 @@
static bool shouldMatchHoverOrActive(
const SelectorChecker::SelectorCheckingContext& context) {
- // If we're in quirks mode, then :hover and :active should never match anchors with no
- // href and *:hover and *:active should not match anything. This is specified in
- // https://quirks.spec.whatwg.org/#the-:active-and-:hover-quirk
+ // If we're in quirks mode, then :hover and :active should never match anchors
+ // with no href and *:hover and *:active should not match anything. This is
+ // specified in https://quirks.spec.whatwg.org/#the-:active-and-:hover-quirk
if (!context.element->document().inQuirksMode())
return true;
if (context.isSubSelector)
@@ -197,7 +200,8 @@
// * SelectorMatches - the selector matches the element e
// * SelectorFailsLocally - the selector fails for the element e
// * SelectorFailsAllSiblings - the selector fails for e and any sibling of e
-// * SelectorFailsCompletely - the selector fails for e and any sibling or ancestor of e
+// * SelectorFailsCompletely - the selector fails for e and any sibling or
+// ancestor of e
SelectorChecker::Match SelectorChecker::matchSelector(
const SelectorCheckingContext& context,
MatchResult& result) const {
@@ -239,7 +243,7 @@
prepareNextContextForRelation(
const SelectorChecker::SelectorCheckingContext& context) {
SelectorChecker::SelectorCheckingContext nextContext(context);
- ASSERT(context.selector->tagHistory());
+ DCHECK(context.selector->tagHistory());
nextContext.selector = context.selector->tagHistory();
return nextContext;
}
@@ -290,7 +294,8 @@
CSSSelector::RelationType relation = context.selector->relation();
- // Disable :visited matching when we see the first link or try to match anything else than an ancestors.
+ // Disable :visited matching when we see the first link or try to match
+ // anything else than an ancestors.
if (!context.isSubSelector &&
(context.element->isLink() ||
(relation != CSSSelector::Descendant && relation != CSSSelector::Child)))
@@ -380,7 +385,8 @@
context.selector->getPseudoType() == CSSSelector::PseudoShadow)
Deprecation::countDeprecation(context.element->document(),
UseCounter::CSSSelectorPseudoShadow);
- // If we're in the same tree-scope as the scoping element, then following a shadow descendant combinator would escape that and thus the scope.
+ // If we're in the same tree-scope as the scoping element, then following
+ // a shadow descendant combinator would escape that and thus the scope.
if (context.scope && context.scope->ownerShadowHost() &&
context.scope->ownerShadowHost()->treeScope() ==
context.element->treeScope())
@@ -403,7 +409,8 @@
}
if (context.selector->relationIsAffectedByPseudoContent()) {
- // TODO(kochi): closed mode tree should be handled as well for ::content.
+ // TODO(kochi): closed mode tree should be handled as well for
+ // ::content.
for (Element* element = context.element; element;
element = element->parentOrShadowHostElement()) {
if (matchForPseudoContent(nextContext, *element, result) ==
@@ -445,7 +452,7 @@
case CSSSelector::SubSelector:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return SelectorFailsCompletely;
}
@@ -529,7 +536,7 @@
return false;
return true;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return false;
}
}
@@ -538,11 +545,12 @@
CSSSelector::MatchType match,
const CSSSelector& selector) {
const QualifiedName& selectorAttr = selector.attribute();
- ASSERT(selectorAttr.localName() !=
- starAtom); // Should not be possible from the CSS grammar.
+ // Should not be possible from the CSS grammar.
+ DCHECK_NE(selectorAttr.localName(), starAtom);
// Synchronize the attribute in case it is lazy-computed.
- // Currently all lazy properties have a null namespace, so only pass localName().
+ // Currently all lazy properties have a null namespace, so only pass
+ // localName().
element.synchronizeAttribute(selectorAttr.localName());
const AtomicString& selectorValue = selector.value();
@@ -591,12 +599,13 @@
bool SelectorChecker::checkOne(const SelectorCheckingContext& context,
MatchResult& result) const {
- ASSERT(context.element);
+ DCHECK(context.element);
Element& element = *context.element;
- ASSERT(context.selector);
+ DCHECK(context.selector);
const CSSSelector& selector = *context.selector;
- // Only :host and :host-context() should match the host: http://drafts.csswg.org/css-scoping/#host-element
+ // Only :host and :host-context() should match the host:
+ // http://drafts.csswg.org/css-scoping/#host-element
if (context.scope && context.scope->ownerShadowHost() == element &&
(!selector.isHostPseudoClass() && !context.treatShadowHostAsNormalScope &&
selector.match() != CSSSelector::PseudoElement))
@@ -628,7 +637,7 @@
return checkPseudoElement(context, result);
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return false;
}
}
@@ -639,22 +648,24 @@
SelectorCheckingContext subContext(context);
subContext.isSubSelector = true;
- ASSERT(selector.selectorList());
+ DCHECK(selector.selectorList());
for (subContext.selector = selector.selectorList()->first();
subContext.selector;
subContext.selector = subContext.selector->tagHistory()) {
// :not cannot nest. I don't really know why this is a
// restriction in CSS3, but it is, so let's honor it.
// the parser enforces that this never occurs
- ASSERT(subContext.selector->getPseudoType() != CSSSelector::PseudoNot);
- // We select between :visited and :link when applying. We don't know which one applied (or not) yet.
+ DCHECK_NE(subContext.selector->getPseudoType(), CSSSelector::PseudoNot);
+ // We select between :visited and :link when applying. We don't know which
+ // one applied (or not) yet.
if (subContext.selector->getPseudoType() == CSSSelector::PseudoVisited ||
(subContext.selector->getPseudoType() == CSSSelector::PseudoLink &&
subContext.visitedMatchType == VisitedMatchEnabled))
return true;
if (m_mode == SharingRules) {
// context.scope is not available if m_mode == SharingRules.
- // We cannot determine whether :host or :scope matches a given element or not.
+ // We cannot determine whether :host or :scope matches a given element or
+ // not.
if (subContext.selector->isHostPseudoClass() ||
subContext.selector->getPseudoType() == CSSSelector::PseudoScope)
return true;
@@ -679,7 +690,8 @@
const CSSSelector& selector = *context.selector;
if (context.hasScrollbarPseudo) {
- // CSS scrollbars match a specific subset of pseudo classes, and they have specialized rules for each
+ // CSS scrollbars match a specific subset of pseudo classes, and they have
+ // specialized rules for each
// (since there are no elements involved).
return checkScrollbarPseudoClass(context, result);
}
@@ -816,7 +828,7 @@
case CSSSelector::PseudoAny: {
SelectorCheckingContext subContext(context);
subContext.isSubSelector = true;
- ASSERT(selector.selectorList());
+ DCHECK(selector.selectorList());
for (subContext.selector = selector.selectorList()->first();
subContext.selector;
subContext.selector = CSSSelectorList::next(*subContext.selector)) {
@@ -953,10 +965,11 @@
return true;
}
case CSSSelector::PseudoFullScreen:
- // While a Document is in the fullscreen state, and the document's current fullscreen
- // element is an element in the document, the 'full-screen' pseudoclass applies to
- // that element. Also, an <iframe>, <object> or <embed> element whose child browsing
- // context's Document is in the fullscreen state has the 'full-screen' pseudoclass applied.
+ // While a Document is in the fullscreen state, and the document's current
+ // fullscreen element is an element in the document, the 'full-screen'
+ // pseudoclass applies to that element. Also, an <iframe>, <object> or
+ // <embed> element whose child browsing context's Document is in the
+ // fullscreen state has the 'full-screen' pseudoclass applied.
if (isHTMLFrameElementBase(element) &&
element.containsFullScreenElement())
return true;
@@ -1020,7 +1033,7 @@
return false;
case CSSSelector::PseudoUnknown:
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
break;
}
return false;
@@ -1066,8 +1079,8 @@
subContext.treatShadowHostAsNormalScope = false;
// ::slotted() only allows one compound selector.
- ASSERT(selector.selectorList()->first());
- ASSERT(!CSSSelectorList::next(*selector.selectorList()->first()));
+ DCHECK(selector.selectorList()->first());
+ DCHECK(!CSSSelectorList::next(*selector.selectorList()->first()));
subContext.selector = selector.selectorList()->first();
return match(subContext);
}
@@ -1078,9 +1091,9 @@
default:
if (m_mode == SharingRules)
return true;
- ASSERT(m_mode != QueryingRules);
+ DCHECK_NE(m_mode, QueryingRules);
result.dynamicPseudo = CSSSelector::pseudoId(selector.getPseudoType());
- ASSERT(result.dynamicPseudo != PseudoIdNone);
+ DCHECK_NE(result.dynamicPseudo, PseudoIdNone);
return true;
}
}
@@ -1092,13 +1105,14 @@
if (m_mode == SharingRules)
return true;
- // :host only matches a shadow host when :host is in a shadow tree of the shadow host.
+ // :host only matches a shadow host when :host is in a shadow tree of the
+ // shadow host.
if (!context.scope)
return false;
const ContainerNode* shadowHost = context.scope->ownerShadowHost();
if (!shadowHost || shadowHost != element)
return false;
- ASSERT(element.shadow());
+ DCHECK(element.shadow());
// For the case with no parameters, i.e. just :host.
if (!selector.selectorList())
@@ -1110,13 +1124,15 @@
bool matched = false;
unsigned maxSpecificity = 0;
- // If one of simple selectors matches an element, returns SelectorMatches. Just "OR".
+ // If one of simple selectors matches an element, returns SelectorMatches.
+ // Just "OR".
for (subContext.selector = selector.selectorList()->first();
subContext.selector;
subContext.selector = CSSSelectorList::next(*subContext.selector)) {
subContext.treatShadowHostAsNormalScope = true;
subContext.scope = context.scope;
- // Use FlatTreeTraversal to traverse a composed ancestor list of a given element.
+ // Use FlatTreeTraversal to traverse a composed ancestor list of a given
+ // element.
Element* nextElement = &element;
SelectorCheckingContext hostContext(subContext);
do {
@@ -1157,7 +1173,8 @@
if (selector.getPseudoType() == CSSSelector::PseudoNot)
return checkPseudoNot(context, result);
- // FIXME: This is a temporary hack for resizers and scrollbar corners. Eventually :window-inactive should become a real
+ // FIXME: This is a temporary hack for resizers and scrollbar corners.
+ // Eventually :window-inactive should become a real
// pseudo class and just apply to everything.
if (selector.getPseudoType() == CSSSelector::PseudoWindowInactive)
return !context.element->document().page()->focusController().isActive();
diff --git a/third_party/WebKit/Source/core/css/SelectorChecker.h b/third_party/WebKit/Source/core/css/SelectorChecker.h
index 3ac2c07..643ba59 100644
--- a/third_party/WebKit/Source/core/css/SelectorChecker.h
+++ b/third_party/WebKit/Source/core/css/SelectorChecker.h
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
*
diff --git a/third_party/WebKit/Source/core/css/SelectorFilter.cpp b/third_party/WebKit/Source/core/css/SelectorFilter.cpp
index 26a0b37..88a96138 100644
--- a/third_party/WebKit/Source/core/css/SelectorFilter.cpp
+++ b/third_party/WebKit/Source/core/css/SelectorFilter.cpp
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
+ * reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -34,7 +36,8 @@
namespace blink {
-// Salt to separate otherwise identical string hashes so a class-selector like .article won't match <article> elements.
+// Salt to separate otherwise identical string hashes so a class-selector like
+// .article won't match <article> elements.
enum { TagNameSalt = 13, IdAttributeSalt = 17, ClassAttributeSalt = 19 };
static inline void collectElementIdentifierHashes(
@@ -100,8 +103,8 @@
return;
}
ASSERT(m_ancestorIdentifierFilter);
- // We may get invoked for some random elements in some wacky cases during style resolve.
- // Pause maintaining the stack in this case.
+ // We may get invoked for some random elements in some wacky cases during
+ // style resolve. Pause maintaining the stack in this case.
if (m_parentStack.last().element != parent.parentOrShadowHostElement())
return;
pushParentStackFrame(parent);
@@ -110,8 +113,8 @@
void SelectorFilter::popParent(Element& parent) {
ASSERT(parent.document().inStyleRecalc());
ASSERT(parent.inActiveDocument());
- // Note that we may get invoked for some random elements in some wacky cases during style resolve.
- // Pause maintaining the stack in this case.
+ // Note that we may get invoked for some random elements in some wacky cases
+ // during style resolve. Pause maintaining the stack in this case.
if (!parentStackIsConsistent(&parent))
return;
popParentStackFrame();
diff --git a/third_party/WebKit/Source/core/css/SelectorFilter.h b/third_party/WebKit/Source/core/css/SelectorFilter.h
index 618a300..8252f2af 100644
--- a/third_party/WebKit/Source/core/css/SelectorFilter.h
+++ b/third_party/WebKit/Source/core/css/SelectorFilter.h
@@ -2,10 +2,12 @@
* Copyright (C) 1999 Lars Knoll (knoll@kde.org)
* (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
* Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
- * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
+ * reserved.
* Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
* Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
- * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
+ * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
+ * (http://www.torchmobile.com/)
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Copyright (C) Research In Motion Limited 2011. All rights reserved.
* Copyright (C) 2012 Google Inc. All rights reserved.
@@ -80,7 +82,8 @@
HeapVector<ParentStackFrame> m_parentStack;
- // With 100 unique strings in the filter, 2^12 slot table has false positive rate of ~0.2%.
+ // With 100 unique strings in the filter, 2^12 slot table has false positive
+ // rate of ~0.2%.
using IdentifierFilter = BloomFilter<12>;
std::unique_ptr<IdentifierFilter> m_ancestorIdentifierFilter;
};
diff --git a/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp b/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp
index 433d6a43..2c59dc3 100644
--- a/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp
+++ b/third_party/WebKit/Source/core/css/StylePropertySerializer.cpp
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2011 Research In Motion Limited. All rights reserved.
* Copyright (C) 2013 Intel Corporation. All rights reserved.
*
@@ -418,7 +419,8 @@
String StylePropertySerializer::getPropertyValue(
CSSPropertyID propertyID) const {
const StylePropertyShorthand& shorthand = shorthandForProperty(propertyID);
- // TODO(timloh): This is weird, why do we call this with non-shorthands at all?
+ // TODO(timloh): This is weird, why do we call this with non-shorthands at
+ // all?
if (!shorthand.length())
return String();
@@ -562,7 +564,8 @@
result.append(prefix);
String value;
- // In the font-variant shorthand a "none" ligatures value needs to be expanded.
+ // In the font-variant shorthand a "none" ligatures value needs to be
+ // expanded.
if (propertyID == CSSPropertyFontVariantLigatures &&
val->isIdentifierValue() &&
toCSSIdentifierValue(val)->getValueID() == CSSValueNone) {
@@ -604,7 +607,8 @@
PropertyValueForSerializer fontVariantNumericProperty =
m_propertySet.propertyAt(fontVariantNumericPropertyIndex);
- // Check that non-initial font-variant subproperties are not conflicting with this serialization.
+ // Check that non-initial font-variant subproperties are not conflicting with
+ // this serialization.
const CSSValue* ligaturesValue = fontVariantLigaturesProperty.value();
const CSSValue* numericValue = fontVariantNumericProperty.value();
if ((ligaturesValue->isIdentifierValue() &&
@@ -640,8 +644,8 @@
String StylePropertySerializer::fontVariantValue() const {
StringBuilder result;
- // TODO(drott): Decide how we want to return ligature values in shorthands, reduced to "none" or
- // spelled out, filed as W3C bug:
+ // TODO(drott): Decide how we want to return ligature values in shorthands,
+ // reduced to "none" or spelled out, filed as W3C bug:
// https://www.w3.org/Bugs/Public/show_bug.cgi?id=29594
appendFontLonghandValueIfNotNormal(CSSPropertyFontVariantLigatures, result);
appendFontLonghandValueIfNotNormal(CSSPropertyFontVariantCaps, result);
@@ -716,7 +720,8 @@
StringBuilder result;
- // Now stitch the properties together. Implicit initial values are flagged as such and
+ // Now stitch the properties together. Implicit initial values are flagged as
+ // such and
// can safely be omitted.
for (size_t layer = 0; layer < numLayers; layer++) {
StringBuilder layerResult;
@@ -761,14 +766,16 @@
? toCSSValueList(values[propertyIndex + 1])->item(layer)
: *values[propertyIndex + 1];
- // FIXME: At some point we need to fix this code to avoid returning an invalid shorthand,
- // since some longhand combinations are not serializable into a single shorthand.
+ // FIXME: At some point we need to fix this code to avoid returning an
+ // invalid shorthand, since some longhand combinations are not
+ // serializable into a single shorthand.
if (!value->isIdentifierValue() || !yValue.isIdentifierValue())
continue;
CSSValueID xId = toCSSIdentifierValue(value)->getValueID();
CSSValueID yId = toCSSIdentifierValue(yValue).getValueID();
- // Maybe advance propertyIndex to look at the next CSSValue in the list for the checks below.
+ // Maybe advance propertyIndex to look at the next CSSValue in the list
+ // for the checks below.
if (xId == yId) {
useSingleWordShorthand = true;
property = shorthand.properties()[++propertyIndex];
@@ -790,7 +797,8 @@
else
layerResult.append(" 0% 0% / ");
} else if (!layerResult.isEmpty()) {
- // Do this second to avoid ending up with an extra space in the output if we hit the continue above.
+ // Do this second to avoid ending up with an extra space in the output
+ // if we hit the continue above.
layerResult.append(' ');
}
@@ -811,8 +819,8 @@
if (property == CSSPropertyBackgroundPositionY ||
property == CSSPropertyWebkitMaskPositionY) {
foundPositionYCSSProperty = true;
- // background-position is a special case. If only the first offset is specified,
- // the second one defaults to "center", not the same value.
+ // background-position is a special case. If only the first offset is
+ // specified, the second one defaults to "center", not the same value.
}
}
}
diff --git a/third_party/WebKit/Source/core/css/StylePropertySerializer.h b/third_party/WebKit/Source/core/css/StylePropertySerializer.h
index 03201db..9c130dd 100644
--- a/third_party/WebKit/Source/core/css/StylePropertySerializer.h
+++ b/third_party/WebKit/Source/core/css/StylePropertySerializer.h
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All
+ * rights reserved.
* Copyright (C) 2011 Research In Motion Limited. All rights reserved.
* Copyright (C) 2013 Intel Corporation. All rights reserved.
*
diff --git a/third_party/WebKit/Source/core/css/StylePropertySet.cpp b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
index a5f721c..35113d0 100644
--- a/third_party/WebKit/Source/core/css/StylePropertySet.cpp
+++ b/third_party/WebKit/Source/core/css/StylePropertySet.cpp
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc.
+ * All rights reserved.
* Copyright (C) 2011 Research In Motion Limited. All rights reserved.
* Copyright (C) 2013 Intel Corporation. All rights reserved.
*
@@ -94,8 +95,8 @@
ImmutableStylePropertySet::~ImmutableStylePropertySet() {}
-// Convert property into an uint16_t for comparison with metadata's m_propertyID to avoid
-// the compiler converting it to an int multiple times in a loop.
+// Convert property into an uint16_t for comparison with metadata's m_propertyID
+// to avoid the compiler converting it to an int multiple times in a loop.
static uint16_t getConvertedCSSPropertyID(CSSPropertyID propertyID) {
return static_cast<uint16_t>(propertyID);
}
@@ -302,13 +303,15 @@
StyleSheetContents* contextStyleSheet) {
DCHECK_GE(unresolvedProperty, firstCSSProperty);
- // Setting the value to an empty string just removes the property in both IE and Gecko.
- // Setting it to null seems to produce less consistent results, but we treat it just the same.
+ // Setting the value to an empty string just removes the property in both IE
+ // and Gecko. Setting it to null seems to produce less consistent results, but
+ // we treat it just the same.
if (value.isEmpty())
return removeProperty(resolveCSSPropertyID(unresolvedProperty));
- // When replacing an existing property value, this moves the property to the end of the list.
- // Firefox preserves the position, and MSIE moves the property to the beginning.
+ // When replacing an existing property value, this moves the property to the
+ // end of the list. Firefox preserves the position, and MSIE moves the
+ // property to the beginning.
return CSSParser::parseValue(this, unresolvedProperty, value, important,
contextStyleSheet);
}
@@ -455,7 +458,8 @@
const CSSProperty& property = properties[oldIndex];
if (containsId(set, length, property.id()))
continue;
- // Modify m_propertyVector in-place since this method is performance-sensitive.
+ // Modify m_propertyVector in-place since this method is
+ // performance-sensitive.
properties[newIndex++] = properties[oldIndex];
}
if (newIndex != oldSize) {
@@ -470,8 +474,8 @@
const AtomicString& customPropertyName) {
int foundPropertyIndex = -1;
if (propertyID == CSSPropertyVariable && !customPropertyName.isNull()) {
- // TODO(shanestephens): fix call sites so we always have a customPropertyName
- // here.
+ // TODO(shanestephens): fix call sites so we always have a
+ // customPropertyName here.
foundPropertyIndex = findPropertyIndex(customPropertyName);
} else {
ASSERT(customPropertyName.isNull());
@@ -574,7 +578,8 @@
}
unsigned StylePropertySet::averageSizeInBytes() {
- // Please update this if the storage scheme changes so that this longer reflects the actual size.
+ // Please update this if the storage scheme changes so that this longer
+ // reflects the actual size.
return sizeForImmutableStylePropertySetWithPropertyCount(4);
}
diff --git a/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp b/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp
index 8b272a1a..b82c04d 100644
--- a/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp
+++ b/third_party/WebKit/Source/core/css/StylePropertyShorthandCustom.cpp
@@ -45,7 +45,8 @@
return webkitAnimationLonghandsForParsing;
}
-// Similar to animations, we have property after timing-function and delay after duration
+// Similar to animations, we have property after timing-function and delay after
+// duration
const StylePropertyShorthand& transitionShorthandForParsing() {
static const CSSPropertyID transitionProperties[] = {
CSSPropertyTransitionDuration, CSSPropertyTransitionTimingFunction,
diff --git a/third_party/WebKit/Source/core/css/StyleRuleImport.cpp b/third_party/WebKit/Source/core/css/StyleRuleImport.cpp
index 63ceebb..6c29e8f4 100644
--- a/third_party/WebKit/Source/core/css/StyleRuleImport.cpp
+++ b/third_party/WebKit/Source/core/css/StyleRuleImport.cpp
@@ -1,7 +1,8 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
* (C) 2002-2003 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/StyleRuleImport.h b/third_party/WebKit/Source/core/css/StyleRuleImport.h
index a5b4497..c965a6c 100644
--- a/third_party/WebKit/Source/core/css/StyleRuleImport.h
+++ b/third_party/WebKit/Source/core/css/StyleRuleImport.h
@@ -58,9 +58,10 @@
DECLARE_TRACE_AFTER_DISPATCH();
private:
- // FIXME: inherit from StyleSheetResourceClient directly to eliminate back pointer, as there are no space savings in this.
- // NOTE: We put the StyleSheetResourceClient in a member instead of inheriting from it
- // to avoid adding a vptr to StyleRuleImport.
+ // FIXME: inherit from StyleSheetResourceClient directly to eliminate back
+ // pointer, as there are no space savings in this.
+ // NOTE: We put the StyleSheetResourceClient in a member instead of inheriting
+ // from it to avoid adding a vptr to StyleRuleImport.
class ImportedStyleSheetClient final
: public GarbageCollectedFinalized<ImportedStyleSheetClient>,
public StyleSheetResourceClient {
diff --git a/third_party/WebKit/Source/core/css/StyleSheetContents.cpp b/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
index 2d224400..6d642af4 100644
--- a/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
+++ b/third_party/WebKit/Source/core/css/StyleSheetContents.cpp
@@ -40,8 +40,9 @@
// Rough size estimate for the memory cache.
unsigned StyleSheetContents::estimatedSizeInBytes() const {
- // Note that this does not take into account size of the strings hanging from various objects.
- // The assumption is that nearly all of of them are atomic and would exist anyway.
+ // Note that this does not take into account size of the strings hanging from
+ // various objects. The assumption is that nearly all of of them are atomic
+ // and would exist anyway.
unsigned size = sizeof(*this);
// FIXME: This ignores the children of media rules.
@@ -121,7 +122,8 @@
// It is not the original sheet anymore.
if (m_isMutable)
return false;
- // If the header is valid we are not going to need to check the SecurityOrigin.
+ // If the header is valid we are not going to need to check the
+ // SecurityOrigin.
// FIXME: Valid mime type avoids the check too.
if (!m_hasSyntacticallyValidCSSHeader)
return false;
@@ -132,7 +134,8 @@
// FIXME: Support copying import rules.
if (!importRules().isEmpty())
return false;
- // Until import rules are supported in cached sheets it's not possible for loading to fail.
+ // Until import rules are supported in cached sheets it's not possible for
+ // loading to fail.
DCHECK(!didLoadErrorOccur());
// It is not the original sheet anymore.
if (isMutable())
@@ -222,7 +225,8 @@
m_importRules.insert(index, importRule);
m_importRules[index]->setParentStyleSheet(this);
m_importRules[index]->requestStyleSheet();
- // FIXME: Stylesheet doesn't actually change meaningfully before the imported sheets are loaded.
+ // FIXME: Stylesheet doesn't actually change meaningfully before the
+ // imported sheets are loaded.
return true;
}
// Inserting @import rule after a non-import rule is not allowed.
@@ -233,20 +237,24 @@
if (index < m_namespaceRules.size() ||
(index == m_namespaceRules.size() && rule->isNamespaceRule())) {
- // Inserting non-namespace rules other than import rule before @namespace is not allowed.
+ // Inserting non-namespace rules other than import rule before @namespace is
+ // not allowed.
if (!rule->isNamespaceRule())
return false;
- // Inserting @namespace rule when rules other than import/namespace/charset are present is not allowed.
+ // Inserting @namespace rule when rules other than import/namespace/charset
+ // are present is not allowed.
if (!m_childRules.isEmpty())
return false;
StyleRuleNamespace* namespaceRule = toStyleRuleNamespace(rule);
m_namespaceRules.insert(index, namespaceRule);
- // For now to be compatible with IE and Firefox if namespace rule with same prefix is added
- // irrespective of adding the rule at any index, last added rule's value is considered.
- // TODO (ramya.v@samsung.com): As per spec last valid rule should be considered,
- // which means if namespace rule is added in the middle of existing namespace rules,
- // rule which comes later in rule list with same prefix needs to be considered.
+ // For now to be compatible with IE and Firefox if namespace rule with same
+ // prefix is added irrespective of adding the rule at any index, last added
+ // rule's value is considered.
+ // TODO (ramya.v@samsung.com): As per spec last valid rule should be
+ // considered, which means if namespace rule is added in the middle of
+ // existing namespace rules, rule which comes later in rule list with same
+ // prefix needs to be considered.
parserAddNamespace(namespaceRule->prefix(), namespaceRule->uri());
return true;
}
@@ -315,8 +323,10 @@
bool isSameOriginRequest =
securityOrigin && securityOrigin->canRequest(baseURL());
- // When the response was fetched via the Service Worker, the original URL may not be same as the base URL.
- // TODO(horo): When we will use the original URL as the base URL, we can remove this check. crbug.com/553535
+ // When the response was fetched via the Service Worker, the original URL may
+ // not be same as the base URL.
+ // TODO(horo): When we will use the original URL as the base URL, we can
+ // remove this check. crbug.com/553535
if (cachedStyleSheet->response().wasFetchedViaServiceWorker()) {
const KURL originalURL(
cachedStyleSheet->response().originalURLViaServiceWorker());
@@ -384,10 +394,10 @@
if (m_loadingClients.isEmpty())
return;
- // Avoid |CSSSStyleSheet| and |ownerNode| being deleted by scripts that run via
- // ScriptableDocumentParser::executeScriptsWaitingForResources(). Also protect
- // the |CSSStyleSheet| from being deleted during iteration via the |sheetLoaded|
- // method.
+ // Avoid |CSSSStyleSheet| and |ownerNode| being deleted by scripts that run
+ // via ScriptableDocumentParser::executeScriptsWaitingForResources(). Also
+ // protect the |CSSStyleSheet| from being deleted during iteration via the
+ // |sheetLoaded| method.
//
// When a sheet is loaded it is moved from the set of loading clients
// to the set of completed clients. We therefore need the copy in order to
@@ -399,7 +409,8 @@
if (loadingClients[i]->loadCompleted())
continue;
- // sheetLoaded might be invoked after its owner node is removed from document.
+ // sheetLoaded might be invoked after its owner node is removed from
+ // document.
if (Node* ownerNode = loadingClients[i]->ownerNode()) {
if (loadingClients[i]->sheetLoaded())
ownerNode->notifyLoadedSheetAndAllCriticalSubresources(
@@ -412,9 +423,10 @@
void StyleSheetContents::notifyLoadedSheet(const CSSStyleSheetResource* sheet) {
ASSERT(sheet);
m_didLoadErrorOccur |= sheet->errorOccurred();
- // updateLayoutIgnorePendingStyleSheets can cause us to create the RuleSet on this
- // sheet before its imports have loaded. So clear the RuleSet when the imports
- // load since the import's subrules are flattened into its parent sheet's RuleSet.
+ // updateLayoutIgnorePendingStyleSheets can cause us to create the RuleSet on
+ // this sheet before its imports have loaded. So clear the RuleSet when the
+ // imports load since the import's subrules are flattened into its parent
+ // sheet's RuleSet.
clearRuleSet();
}
@@ -423,10 +435,10 @@
for (const auto& client : root->m_loadingClients)
client->startLoadingDynamicSheet();
// Copy the completed clients to a vector for iteration.
- // startLoadingDynamicSheet will move the style sheet from the
- // completed state to the loading state which modifies the set of
- // completed clients. We therefore need the copy in order to not
- // modify the set of completed clients while iterating it.
+ // startLoadingDynamicSheet will move the style sheet from the completed state
+ // to the loading state which modifies the set of completed clients. We
+ // therefore need the copy in order to not modify the set of completed clients
+ // while iterating it.
HeapVector<Member<CSSStyleSheet>> completedClients;
copyToVector(root->m_completedClients, completedClients);
for (unsigned i = 0; i < completedClients.size(); ++i)
@@ -515,7 +527,8 @@
ASSERT(!m_loadingClients.contains(sheet) &&
!m_completedClients.contains(sheet));
- // InspectorCSSAgent::buildObjectForRule creates CSSStyleSheet without any owner node.
+ // InspectorCSSAgent::buildObjectForRule creates CSSStyleSheet without any
+ // owner node.
if (!sheet->ownerDocument())
return;
@@ -594,8 +607,9 @@
if (!m_ruleSet)
return;
- // Clearing the ruleSet means we need to recreate the styleResolver data structures.
- // See the StyleResolver calls in ScopedStyleResolver::addRulesFromSheet.
+ // Clearing the ruleSet means we need to recreate the styleResolver data
+ // structures. See the StyleResolver calls in
+ // ScopedStyleResolver::addRulesFromSheet.
clearResolvers(m_loadingClients);
clearResolvers(m_completedClients);
m_ruleSet.clear();
diff --git a/third_party/WebKit/Source/core/css/StyleSheetContents.h b/third_party/WebKit/Source/core/css/StyleSheetContents.h
index 009e6a1..af8aad3 100644
--- a/third_party/WebKit/Source/core/css/StyleSheetContents.h
+++ b/third_party/WebKit/Source/core/css/StyleSheetContents.h
@@ -1,6 +1,7 @@
/*
* (C) 1999-2003 Lars Knoll (knoll@kde.org)
- * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All rights
+ * reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
diff --git a/third_party/WebKit/Source/core/css/StyleSheetList.cpp b/third_party/WebKit/Source/core/css/StyleSheetList.cpp
index 947e822..3d90339 100644
--- a/third_party/WebKit/Source/core/css/StyleSheetList.cpp
+++ b/third_party/WebKit/Source/core/css/StyleSheetList.cpp
@@ -48,11 +48,11 @@
}
HTMLStyleElement* StyleSheetList::getNamedItem(const AtomicString& name) const {
- // IE also supports retrieving a stylesheet by name, using the name/id of the <style> tag
- // (this is consistent with all the other collections)
- // ### Bad implementation because returns a single element (are IDs always unique?)
- // and doesn't look for name attribute.
- // But unicity of stylesheet ids is good practice anyway ;)
+ // IE also supports retrieving a stylesheet by name, using the name/id of the
+ // <style> tag (this is consistent with all the other collections) ### Bad
+ // implementation because returns a single element (are IDs always unique?)
+ // and doesn't look for name attribute. But unicity of stylesheet ids is good
+ // practice anyway ;)
// FIXME: We should figure out if we should change this or fix the spec.
Element* element = m_treeScope->getElementById(name);
return isHTMLStyleElement(element) ? toHTMLStyleElement(element) : nullptr;
