summaryrefslogtreecommitdiff
path: root/Source/WebCore/css
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/css')
-rw-r--r--Source/WebCore/css/CSSFontFaceSrcValue.cpp4
-rw-r--r--Source/WebCore/css/CSSImageSetValue.cpp3
-rw-r--r--Source/WebCore/css/CSSImageValue.cpp3
-rw-r--r--Source/WebCore/css/CSSParser.cpp2
-rw-r--r--Source/WebCore/css/CSSPrimitiveValueMappings.h10
-rw-r--r--Source/WebCore/css/CSSValueKeywords.in2
-rw-r--r--Source/WebCore/css/StyleResolver.cpp6
-rw-r--r--Source/WebCore/css/StyleRuleImport.cpp7
-rw-r--r--Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp3
-rw-r--r--Source/WebCore/css/WebKitCSSShaderValue.cpp5
10 files changed, 26 insertions, 19 deletions
diff --git a/Source/WebCore/css/CSSFontFaceSrcValue.cpp b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
index 2a1c04787..369078933 100644
--- a/Source/WebCore/css/CSSFontFaceSrcValue.cpp
+++ b/Source/WebCore/css/CSSFontFaceSrcValue.cpp
@@ -27,6 +27,7 @@
#include "CSSFontFaceSrcValue.h"
#include "CachedFont.h"
#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "FontCustomPlatformData.h"
#include "Node.h"
@@ -95,7 +96,7 @@ bool CSSFontFaceSrcValue::hasFailedOrCanceledSubresources() const
CachedFont* CSSFontFaceSrcValue::cachedFont(Document* document)
{
if (!m_cachedFont) {
- ResourceRequest request(document->completeURL(m_resource));
+ CachedResourceRequest request(ResourceRequest(document->completeURL(m_resource)));
m_cachedFont = document->cachedResourceLoader()->requestFont(request);
}
return m_cachedFont.get();
@@ -113,4 +114,3 @@ void CSSFontFaceSrcValue::reportDescendantMemoryUsage(MemoryObjectInfo* memoryOb
}
}
-
diff --git a/Source/WebCore/css/CSSImageSetValue.cpp b/Source/WebCore/css/CSSImageSetValue.cpp
index 6e02a20f9..6dc76f580 100644
--- a/Source/WebCore/css/CSSImageSetValue.cpp
+++ b/Source/WebCore/css/CSSImageSetValue.cpp
@@ -32,6 +32,7 @@
#include "CSSPrimitiveValue.h"
#include "CachedImage.h"
#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "Page.h"
#include "StyleCachedImageSet.h"
@@ -108,7 +109,7 @@ StyleCachedImageSet* CSSImageSetValue::cachedImageSet(CachedResourceLoader* load
// All forms of scale should be included: Page::pageScaleFactor(), Frame::pageZoomFactor(),
// and any CSS transforms. https://bugs.webkit.org/show_bug.cgi?id=81698
ImageWithScale image = bestImageForScaleFactor();
- ResourceRequest request(loader->document()->completeURL(image.imageURL));
+ CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(image.imageURL)));
if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);
m_accessedBestFitImage = true;
diff --git a/Source/WebCore/css/CSSImageValue.cpp b/Source/WebCore/css/CSSImageValue.cpp
index 726c2c043..6b73d4631 100644
--- a/Source/WebCore/css/CSSImageValue.cpp
+++ b/Source/WebCore/css/CSSImageValue.cpp
@@ -26,6 +26,7 @@
#include "CSSValueKeywords.h"
#include "CachedImage.h"
#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "MemoryCache.h"
#include "StyleCachedImage.h"
@@ -82,7 +83,7 @@ StyleCachedImage* CSSImageValue::cachedImage(CachedResourceLoader* loader, const
if (!m_accessedImage) {
m_accessedImage = true;
- ResourceRequest request(loader->document()->completeURL(url));
+ CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(url)));
if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request))
m_image = StyleCachedImage::create(cachedImage.get());
}
diff --git a/Source/WebCore/css/CSSParser.cpp b/Source/WebCore/css/CSSParser.cpp
index af3bab602..d16537e6c 100644
--- a/Source/WebCore/css/CSSParser.cpp
+++ b/Source/WebCore/css/CSSParser.cpp
@@ -806,7 +806,7 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int
return true;
break;
case CSSPropertyWebkitFlexWrap:
- if (valueID == CSSValueNone || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
+ if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse)
return true;
break;
case CSSPropertyWebkitJustifyContent:
diff --git a/Source/WebCore/css/CSSPrimitiveValueMappings.h b/Source/WebCore/css/CSSPrimitiveValueMappings.h
index 06c18ba9f..984c0826e 100644
--- a/Source/WebCore/css/CSSPrimitiveValueMappings.h
+++ b/Source/WebCore/css/CSSPrimitiveValueMappings.h
@@ -1380,8 +1380,8 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexWrap e)
{
m_primitiveUnitType = CSS_IDENT;
switch (e) {
- case FlexWrapNone:
- m_value.ident = CSSValueNone;
+ case FlexNoWrap:
+ m_value.ident = CSSValueNowrap;
break;
case FlexWrap:
m_value.ident = CSSValueWrap;
@@ -1395,8 +1395,8 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexWrap e)
template<> inline CSSPrimitiveValue::operator EFlexWrap() const
{
switch (m_value.ident) {
- case CSSValueNone:
- return FlexWrapNone;
+ case CSSValueNowrap:
+ return FlexNoWrap;
case CSSValueWrap:
return FlexWrap;
case CSSValueWrapReverse:
@@ -1404,7 +1404,7 @@ template<> inline CSSPrimitiveValue::operator EFlexWrap() const
}
ASSERT_NOT_REACHED();
- return FlexWrapNone;
+ return FlexNoWrap;
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e)
diff --git a/Source/WebCore/css/CSSValueKeywords.in b/Source/WebCore/css/CSSValueKeywords.in
index 37eafdca9..c60aa586d 100644
--- a/Source/WebCore/css/CSSValueKeywords.in
+++ b/Source/WebCore/css/CSSValueKeywords.in
@@ -517,7 +517,7 @@ row
row-reverse
column
column-reverse
-// none
+// nowrap
// wrap
wrap-reverse
diff --git a/Source/WebCore/css/StyleResolver.cpp b/Source/WebCore/css/StyleResolver.cpp
index 9318b7a16..ad8ddcb3c 100644
--- a/Source/WebCore/css/StyleResolver.cpp
+++ b/Source/WebCore/css/StyleResolver.cpp
@@ -75,6 +75,7 @@
#include "HTMLProgressElement.h"
#include "HTMLStyleElement.h"
#include "HTMLTextAreaElement.h"
+#include "InsertionPoint.h"
#include "InspectorInstrumentation.h"
#include "KeyframeList.h"
#include "LinkHash.h"
@@ -961,8 +962,9 @@ inline bool shouldResetStyleInheritance(NodeRenderingContext& context)
InsertionPoint* insertionPoint = context.insertionPoint();
if (!insertionPoint)
return false;
- ASSERT(context.node()->parentElement());
- ElementShadow* shadow = context.node()->parentElement()->shadow();
+
+ ASSERT(parentElementForDistribution(context.node()));
+ ElementShadow* shadow = parentElementForDistribution(context.node())->shadow();
ASSERT(shadow);
for ( ; insertionPoint; ) {
diff --git a/Source/WebCore/css/StyleRuleImport.cpp b/Source/WebCore/css/StyleRuleImport.cpp
index 26f29e82f..eec350771 100644
--- a/Source/WebCore/css/StyleRuleImport.cpp
+++ b/Source/WebCore/css/StyleRuleImport.cpp
@@ -25,6 +25,7 @@
#include "CSSStyleSheet.h"
#include "CachedCSSStyleSheet.h"
#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "SecurityOrigin.h"
#include "StyleSheetContents.h"
@@ -115,11 +116,11 @@ void StyleRuleImport::requestStyleSheet()
rootSheet = sheet;
}
- ResourceRequest request(absURL);
+ CachedResourceRequest request(ResourceRequest(absURL), m_parentStyleSheet->charset());
if (m_parentStyleSheet->isUserStyleSheet())
- m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request, m_parentStyleSheet->charset());
+ m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request);
else
- m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request, m_parentStyleSheet->charset());
+ m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request);
if (m_cachedSheet) {
// if the import rule is issued dynamically, the sheet may be
// removed from the pending sheet count, so let the doc know
diff --git a/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp b/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp
index 44c880894..67e84e3c9 100644
--- a/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp
+++ b/Source/WebCore/css/WebKitCSSSVGDocumentValue.cpp
@@ -29,6 +29,7 @@
#include "CSSParser.h"
#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "WebCoreMemoryInstrumentation.h"
@@ -52,7 +53,7 @@ CachedSVGDocument* WebKitCSSSVGDocumentValue::load(CachedResourceLoader* loader)
if (!m_loadRequested) {
m_loadRequested = true;
- ResourceRequest request(loader->document()->completeURL(m_url));
+ CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
m_document = loader->requestSVGDocument(request);
}
diff --git a/Source/WebCore/css/WebKitCSSShaderValue.cpp b/Source/WebCore/css/WebKitCSSShaderValue.cpp
index 6f9373e0f..fa04190c3 100644
--- a/Source/WebCore/css/WebKitCSSShaderValue.cpp
+++ b/Source/WebCore/css/WebKitCSSShaderValue.cpp
@@ -32,8 +32,9 @@
#if ENABLE(CSS_SHADERS)
#include "WebKitCSSShaderValue.h"
-#include "CachedResourceLoader.h"
#include "CSSParser.h"
+#include "CachedResourceLoader.h"
+#include "CachedResourceRequest.h"
#include "Document.h"
#include "StyleCachedShader.h"
#include "StylePendingShader.h"
@@ -59,7 +60,7 @@ StyleCachedShader* WebKitCSSShaderValue::cachedShader(CachedResourceLoader* load
if (!m_accessedShader) {
m_accessedShader = true;
- ResourceRequest request(loader->document()->completeURL(m_url));
+ CachedResourceRequest request(ResourceRequest(loader->document()->completeURL(m_url)));
if (CachedResourceHandle<CachedShader> cachedShader = loader->requestShader(request))
m_shader = StyleCachedShader::create(cachedShader.get());
}
View Lorry Controller Status