[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 12:35:40 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit b6b3e2e360218b50078827a817e1cb818045545f
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Aug 25 20:23:58 2010 +0000
2010-08-25 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
Remove XBL
https://bugs.webkit.org/show_bug.cgi?id=44621
This patch removes support for XBL. XBL seems cool, but this code is
old and pretty bitrotten. If we decide to support XBL in the future,
we can recover this code from this revision. As it stands, it doesn't
seem worth half-maintaining this code.
* Android.mk:
* CMakeLists.txt:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
* css/CSSParser.cpp:
(WebCore::CSSParser::parseValue):
* css/CSSPropertyNames.in:
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::applyProperty):
* dom/Document.cpp:
(WebCore::Document::Document):
(WebCore::Document::~Document):
* dom/Document.h:
* loader/Cache.cpp:
(WebCore::createResource):
(WebCore::Cache::getStatistics):
* loader/Cache.h:
* loader/CachedResource.h:
(WebCore::CachedResource::):
* loader/CachedResourceClient.h:
(WebCore::CachedResourceClient::setXSLStyleSheet):
(WebCore::CachedResourceClient::fontLoaded):
* loader/CachedXBLDocument.cpp: Removed.
* loader/CachedXBLDocument.h: Removed.
* loader/DocLoader.cpp:
(WebCore::DocLoader::canRequest):
* loader/DocLoader.h:
* loader/loader.cpp:
(WebCore::cachedResourceTypeToTargetType):
(WebCore::Loader::determinePriority):
* rendering/style/BindingURI.cpp: Removed.
* rendering/style/BindingURI.h: Removed.
* rendering/style/RenderStyle.cpp:
* rendering/style/RenderStyle.h:
* rendering/style/StyleRareNonInheritedData.cpp:
(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
(WebCore::StyleRareNonInheritedData::operator==):
* rendering/style/StyleRareNonInheritedData.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66037 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 7bfa1b8..68a5f95 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -719,7 +719,6 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
rendering/TransformState.cpp \
rendering/break_lines.cpp \
\
- rendering/style/BindingURI.cpp \
rendering/style/ContentData.cpp \
rendering/style/CounterDirectives.cpp \
rendering/style/FillLayer.cpp \
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 32d2d57..6dbf082 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -1427,7 +1427,6 @@ SET(WebCore_SOURCES
rendering/TextControlInnerElements.cpp
rendering/TransformState.cpp
rendering/break_lines.cpp
- rendering/style/BindingURI.cpp
rendering/style/ContentData.cpp
rendering/style/CounterDirectives.cpp
rendering/style/FillLayer.cpp
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cd141de..6cdde62 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,59 @@
+2010-08-25 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ Remove XBL
+ https://bugs.webkit.org/show_bug.cgi?id=44621
+
+ This patch removes support for XBL. XBL seems cool, but this code is
+ old and pretty bitrotten. If we decide to support XBL in the future,
+ we can recover this code from this revision. As it stands, it doesn't
+ seem worth half-maintaining this code.
+
+ * Android.mk:
+ * CMakeLists.txt:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseValue):
+ * css/CSSPropertyNames.in:
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::applyProperty):
+ * dom/Document.cpp:
+ (WebCore::Document::Document):
+ (WebCore::Document::~Document):
+ * dom/Document.h:
+ * loader/Cache.cpp:
+ (WebCore::createResource):
+ (WebCore::Cache::getStatistics):
+ * loader/Cache.h:
+ * loader/CachedResource.h:
+ (WebCore::CachedResource::):
+ * loader/CachedResourceClient.h:
+ (WebCore::CachedResourceClient::setXSLStyleSheet):
+ (WebCore::CachedResourceClient::fontLoaded):
+ * loader/CachedXBLDocument.cpp: Removed.
+ * loader/CachedXBLDocument.h: Removed.
+ * loader/DocLoader.cpp:
+ (WebCore::DocLoader::canRequest):
+ * loader/DocLoader.h:
+ * loader/loader.cpp:
+ (WebCore::cachedResourceTypeToTargetType):
+ (WebCore::Loader::determinePriority):
+ * rendering/style/BindingURI.cpp: Removed.
+ * rendering/style/BindingURI.h: Removed.
+ * rendering/style/RenderStyle.cpp:
+ * rendering/style/RenderStyle.h:
+ * rendering/style/StyleRareNonInheritedData.cpp:
+ (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):
+ (WebCore::StyleRareNonInheritedData::operator==):
+ * rendering/style/StyleRareNonInheritedData.h:
+
2010-08-25 Andreas Kling <andreas.kling at nokia.com>
Reviewed by Ariya Hidayat.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index b47188e..dac604b 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -1661,7 +1661,6 @@ webcore_sources += \
WebCore/loader/CachedResourceHandle.h \
WebCore/loader/CachedScript.cpp \
WebCore/loader/CachedScript.h \
- WebCore/loader/CachedXBLDocument.h \
WebCore/loader/CachedXSLStyleSheet.cpp \
WebCore/loader/CachedXSLStyleSheet.h \
WebCore/loader/CrossOriginAccessControl.cpp \
@@ -2372,8 +2371,6 @@ webcore_sources += \
WebCore/rendering/TransformState.h \
WebCore/rendering/break_lines.cpp \
WebCore/rendering/break_lines.h \
- WebCore/rendering/style/BindingURI.cpp \
- WebCore/rendering/style/BindingURI.h \
WebCore/rendering/style/BorderData.h \
WebCore/rendering/style/BorderValue.h \
WebCore/rendering/style/CollapsedBorderValue.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 8117dfe..0f15977 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -1846,8 +1846,6 @@
'loader/CachedResourceHandle.h',
'loader/CachedScript.cpp',
'loader/CachedScript.h',
- 'loader/CachedXBLDocument.cpp',
- 'loader/CachedXBLDocument.h',
'loader/CachedXSLStyleSheet.cpp',
'loader/CachedXSLStyleSheet.h',
'loader/CrossOriginAccessControl.cpp',
@@ -3193,8 +3191,6 @@
'plugins/PluginViewNone.cpp',
'plugins/npapi.cpp',
'plugins/npfunctions.h',
- 'rendering/style/BindingURI.cpp',
- 'rendering/style/BindingURI.h',
'rendering/style/BorderData.h',
'rendering/style/BorderValue.h',
'rendering/style/CollapsedBorderValue.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 62d1c68..d1ff8b2 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1061,7 +1061,6 @@ SOURCES += \
rendering/ShadowElement.cpp \
rendering/TextControlInnerElements.cpp \
rendering/TransformState.cpp \
- rendering/style/BindingURI.cpp \
rendering/style/ContentData.cpp \
rendering/style/CounterDirectives.cpp \
rendering/style/FillLayer.cpp \
@@ -1917,7 +1916,6 @@ HEADERS += \
rendering/RootInlineBox.h \
rendering/ScrollBehavior.h \
rendering/ShadowElement.h \
- rendering/style/BindingURI.h \
rendering/style/ContentData.h \
rendering/style/CounterDirectives.h \
rendering/style/CursorData.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index f79206b..3461239 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -23453,14 +23453,6 @@
>
</File>
<File
- RelativePath="..\loader\CachedXBLDocument.cpp"
- >
- </File>
- <File
- RelativePath="..\loader\CachedXBLDocument.h"
- >
- </File>
- <File
RelativePath="..\loader\CachedXSLStyleSheet.cpp"
>
</File>
@@ -32794,14 +32786,6 @@
Name="style"
>
<File
- RelativePath="..\rendering\style\BindingURI.cpp"
- >
- </File>
- <File
- RelativePath="..\rendering\style\BindingURI.h"
- >
- </File>
- <File
RelativePath="..\rendering\style\BorderData.h"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index ef4b804..d7633e3 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4661,8 +4661,6 @@
BC5EB8B90E8201BD00B25965 /* StyleFlexibleBoxData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB8B70E8201BD00B25965 /* StyleFlexibleBoxData.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5EB8C30E82031B00B25965 /* ShadowData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB8C10E82031B00B25965 /* ShadowData.cpp */; };
BC5EB8C40E82031B00B25965 /* ShadowData.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB8C20E82031B00B25965 /* ShadowData.h */; settings = {ATTRIBUTES = (Private, ); }; };
- BC5EB91F0E82040800B25965 /* BindingURI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB91D0E82040800B25965 /* BindingURI.cpp */; };
- BC5EB9200E82040800B25965 /* BindingURI.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB91E0E82040800B25965 /* BindingURI.h */; };
BC5EB9500E82056B00B25965 /* CounterDirectives.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC5EB94E0E82056B00B25965 /* CounterDirectives.cpp */; };
BC5EB9510E82056B00B25965 /* CounterDirectives.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB94F0E82056B00B25965 /* CounterDirectives.h */; settings = {ATTRIBUTES = (Private, ); }; };
BC5EB9790E82069200B25965 /* CounterContent.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5EB9780E82069200B25965 /* CounterContent.h */; };
@@ -4847,8 +4845,6 @@
BCB16C220979C3BD00467741 /* CachedResourceClientWalker.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */; };
BCB16C230979C3BD00467741 /* CachedScript.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0A0979C3BD00467741 /* CachedScript.cpp */; };
BCB16C240979C3BD00467741 /* CachedScript.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0B0979C3BD00467741 /* CachedScript.h */; };
- BCB16C250979C3BD00467741 /* CachedXBLDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */; };
- BCB16C260979C3BD00467741 /* CachedXBLDocument.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0D0979C3BD00467741 /* CachedXBLDocument.h */; };
BCB16C270979C3BD00467741 /* CachedXSLStyleSheet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */; };
BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */ = {isa = PBXBuildFile; fileRef = BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */; };
BCB16C290979C3BD00467741 /* DocLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BCB16C100979C3BD00467741 /* DocLoader.cpp */; };
@@ -10447,8 +10443,6 @@
BC5EB8B70E8201BD00B25965 /* StyleFlexibleBoxData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleFlexibleBoxData.h; path = style/StyleFlexibleBoxData.h; sourceTree = "<group>"; };
BC5EB8C10E82031B00B25965 /* ShadowData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ShadowData.cpp; path = style/ShadowData.cpp; sourceTree = "<group>"; };
BC5EB8C20E82031B00B25965 /* ShadowData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ShadowData.h; path = style/ShadowData.h; sourceTree = "<group>"; };
- BC5EB91D0E82040800B25965 /* BindingURI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BindingURI.cpp; path = style/BindingURI.cpp; sourceTree = "<group>"; };
- BC5EB91E0E82040800B25965 /* BindingURI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BindingURI.h; path = style/BindingURI.h; sourceTree = "<group>"; };
BC5EB94E0E82056B00B25965 /* CounterDirectives.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CounterDirectives.cpp; path = style/CounterDirectives.cpp; sourceTree = "<group>"; };
BC5EB94F0E82056B00B25965 /* CounterDirectives.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CounterDirectives.h; path = style/CounterDirectives.h; sourceTree = "<group>"; };
BC5EB9780E82069200B25965 /* CounterContent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CounterContent.h; path = style/CounterContent.h; sourceTree = "<group>"; };
@@ -10651,8 +10645,6 @@
BCB16C090979C3BD00467741 /* CachedResourceClientWalker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedResourceClientWalker.h; sourceTree = "<group>"; };
BCB16C0A0979C3BD00467741 /* CachedScript.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedScript.cpp; sourceTree = "<group>"; };
BCB16C0B0979C3BD00467741 /* CachedScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedScript.h; sourceTree = "<group>"; };
- BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedXBLDocument.cpp; sourceTree = "<group>"; };
- BCB16C0D0979C3BD00467741 /* CachedXBLDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedXBLDocument.h; sourceTree = "<group>"; };
BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedXSLStyleSheet.cpp; sourceTree = "<group>"; };
BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedXSLStyleSheet.h; sourceTree = "<group>"; };
BCB16C100979C3BD00467741 /* DocLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DocLoader.cpp; sourceTree = "<group>"; };
@@ -16313,8 +16305,6 @@
BC8C8FAA0DDCD2F200B592F4 /* style */ = {
isa = PBXGroup;
children = (
- BC5EB91D0E82040800B25965 /* BindingURI.cpp */,
- BC5EB91E0E82040800B25965 /* BindingURI.h */,
BC5EB5E00E81BE8700B25965 /* BorderData.h */,
BC5EB5DA0E81B7EA00B25965 /* BorderValue.h */,
BC5EB5DE0E81B9AB00B25965 /* CollapsedBorderValue.h */,
@@ -16461,8 +16451,6 @@
E472053A0E5A053A0006BB4D /* CachedResourceHandle.h */,
BCB16C0A0979C3BD00467741 /* CachedScript.cpp */,
BCB16C0B0979C3BD00467741 /* CachedScript.h */,
- BCB16C0C0979C3BD00467741 /* CachedXBLDocument.cpp */,
- BCB16C0D0979C3BD00467741 /* CachedXBLDocument.h */,
BCB16C0E0979C3BD00467741 /* CachedXSLStyleSheet.cpp */,
BCB16C0F0979C3BD00467741 /* CachedXSLStyleSheet.h */,
F587864902DE3A9A01EA4122 /* CachePolicy.h */,
@@ -17730,7 +17718,6 @@
B2C3DA250D006C1D00EF6F26 /* BidiResolver.h in Headers */,
BCE789861120E7A60060ECE5 /* BidiRun.h in Headers */,
938192050F87E1EC00D5352A /* BinaryPropertyList.h in Headers */,
- BC5EB9200E82040800B25965 /* BindingURI.h in Headers */,
A89943280B42338800D7C802 /* BitmapImage.h in Headers */,
2EAFAF0F10E2AF2D007ED3D6 /* Blob.h in Headers */,
89BED5EC11BE11CE00448492 /* BlobBuilder.h in Headers */,
@@ -17760,7 +17747,6 @@
E47B4BE80E71241600038854 /* CachedResourceHandle.h in Headers */,
BCB16C240979C3BD00467741 /* CachedScript.h in Headers */,
BCD533640ED6848900887468 /* CachedScriptSourceProvider.h in Headers */,
- BCB16C260979C3BD00467741 /* CachedXBLDocument.h in Headers */,
BCB16C280979C3BD00467741 /* CachedXSLStyleSheet.h in Headers */,
93F1995008245E59001E9ABC /* CachePolicy.h in Headers */,
6E4E91AD10F7FB3100A2779C /* CanvasContextAttributes.h in Headers */,
@@ -20748,7 +20734,6 @@
B2C3DA230D006C1D00EF6F26 /* BidiContext.cpp in Sources */,
BCE7898B1120E8020060ECE5 /* BidiRun.cpp in Sources */,
938192030F87E1E600D5352A /* BinaryPropertyList.cpp in Sources */,
- BC5EB91F0E82040800B25965 /* BindingURI.cpp in Sources */,
A89943290B42338800D7C802 /* BitmapImage.cpp in Sources */,
2EAFAF0E10E2AF2D007ED3D6 /* Blob.cpp in Sources */,
89BED5EB11BE11CE00448492 /* BlobBuilder.cpp in Sources */,
@@ -20772,7 +20757,6 @@
BCB16C210979C3BD00467741 /* CachedResourceClientWalker.cpp in Sources */,
E47B4BE90E71241600038854 /* CachedResourceHandle.cpp in Sources */,
BCB16C230979C3BD00467741 /* CachedScript.cpp in Sources */,
- BCB16C250979C3BD00467741 /* CachedXBLDocument.cpp in Sources */,
BCB16C270979C3BD00467741 /* CachedXSLStyleSheet.cpp in Sources */,
6E4E91AC10F7FB3100A2779C /* CanvasContextAttributes.cpp in Sources */,
49484FC1102CF23C00187DD3 /* CanvasGradient.cpp in Sources */,
diff --git a/WebCore/css/CSSComputedStyleDeclaration.cpp b/WebCore/css/CSSComputedStyleDeclaration.cpp
index 90e490a..7b4f329 100644
--- a/WebCore/css/CSSComputedStyleDeclaration.cpp
+++ b/WebCore/css/CSSComputedStyleDeclaration.cpp
@@ -866,8 +866,6 @@ PassRefPtr<CSSValue> CSSComputedStyleDeclaration::getPropertyCSSValue(int proper
}
case CSSPropertyFontSize:
return CSSPrimitiveValue::create(style->fontDescription().computedPixelSize(), CSSPrimitiveValue::CSS_PX);
- case CSSPropertyWebkitBinding:
- break;
case CSSPropertyFontStyle:
if (style->fontDescription().italic())
return CSSPrimitiveValue::createIdentifier(CSSValueItalic);
diff --git a/WebCore/css/CSSParser.cpp b/WebCore/css/CSSParser.cpp
index a059ffc..c1f8177 100644
--- a/WebCore/css/CSSParser.cpp
+++ b/WebCore/css/CSSParser.cpp
@@ -1149,40 +1149,6 @@ bool CSSParser::parseValue(int propId, bool important)
validPrimitive = true;
break;
- case CSSPropertyWebkitBinding:
-#if ENABLE(XBL)
- if (id == CSSValueNone)
- validPrimitive = true;
- else {
- RefPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
- CSSParserValue* val;
- RefPtr<CSSValue> parsedValue;
- while ((val = m_valueList->current())) {
- if (val->unit == CSSPrimitiveValue::CSS_URI && m_styleSheet) {
- // FIXME: The completeURL call should be done when using the CSSPrimitiveValue,
- // not when creating it.
- parsedValue = CSSPrimitiveValue::create(m_styleSheet->completeURL(val->string), CSSPrimitiveValue::CSS_URI);
- }
- if (!parsedValue)
- break;
-
- // FIXME: We can't use release() here since we might hit this path twice
- // but that logic seems wrong to me to begin with, we convert all non-uri values
- // into the last seen URI value!?
- // -webkit-binding: url(foo.xml), 1, 2; (if that were valid) is treated as:
- // -webkit-binding: url(foo.xml), url(foo.xml), url(foo.xml); !?
- values->append(parsedValue.get());
- m_valueList->next();
- }
- if (!values->length())
- return false;
-
- addProperty(propId, values.release(), important);
- m_valueList->next();
- return true;
- }
-#endif
- break;
case CSSPropertyWebkitBorderImage:
case CSSPropertyWebkitMaskBoxImage:
if (id == CSSValueNone)
diff --git a/WebCore/css/CSSPropertyNames.in b/WebCore/css/CSSPropertyNames.in
index d236b45..0216ae1 100644
--- a/WebCore/css/CSSPropertyNames.in
+++ b/WebCore/css/CSSPropertyNames.in
@@ -172,7 +172,6 @@ z-index
# a single value: -webkit-background-size: l; is equivalent to background-size: l l;
# whereas background-size: l; is equivalent to background-size: l auto;
-webkit-background-size
--webkit-binding
-webkit-border-end
-webkit-border-end-color
-webkit-border-end-style
diff --git a/WebCore/css/CSSStyleSelector.cpp b/WebCore/css/CSSStyleSelector.cpp
index 4ee49d0..120519b 100644
--- a/WebCore/css/CSSStyleSelector.cpp
+++ b/WebCore/css/CSSStyleSelector.cpp
@@ -4687,37 +4687,6 @@ void CSSStyleSelector::applyProperty(int id, CSSValue *value)
m_style->setAppearance(*primitiveValue);
return;
}
- case CSSPropertyWebkitBinding: {
-#if ENABLE(XBL)
- if (isInitial || (primitiveValue && primitiveValue->getIdent() == CSSValueNone)) {
- m_style->deleteBindingURIs();
- return;
- }
- else if (isInherit) {
- if (m_parentStyle->bindingURIs())
- m_style->inheritBindingURIs(m_parentStyle->bindingURIs());
- else
- m_style->deleteBindingURIs();
- return;
- }
-
- if (!value->isValueList()) return;
- CSSValueList* list = static_cast<CSSValueList*>(value);
- bool firstBinding = true;
- for (unsigned int i = 0; i < list->length(); i++) {
- CSSValue *item = list->itemWithoutBoundsCheck(i);
- CSSPrimitiveValue *val = static_cast<CSSPrimitiveValue*>(item);
- if (val->primitiveType() == CSSPrimitiveValue::CSS_URI) {
- if (firstBinding) {
- firstBinding = false;
- m_style->deleteBindingURIs();
- }
- m_style->addBindingURI(val->getStringValue());
- }
- }
-#endif
- return;
- }
case CSSPropertyWebkitBorderImage:
case CSSPropertyWebkitMaskBoxImage: {
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 90939d3..dd7f1da 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -163,10 +163,6 @@
#include "XSLTProcessor.h"
#endif
-#if ENABLE(XBL)
-#include "XBLBindingManager.h"
-#endif
-
#if ENABLE(SVG)
#include "SVGDocumentExtensions.h"
#include "SVGElementFactory.h"
@@ -374,9 +370,6 @@ Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML)
, m_asyncScriptRunner(AsyncScriptRunner::create())
, m_xmlVersion("1.0")
, m_xmlStandalone(false)
-#if ENABLE(XBL)
- , m_bindingManager(new XBLBindingManager(this))
-#endif
, m_savedRenderer(0)
, m_designMode(inherit)
, m_selfOnlyRefCount(0)
@@ -543,10 +536,6 @@ Document::~Document()
m_renderArena.clear();
-#if ENABLE(XBL)
- m_bindingManager.clear();
-#endif
-
clearAXObjectCache();
m_decoder = 0;
diff --git a/WebCore/dom/Document.h b/WebCore/dom/Document.h
index 984306f..1c1ec00 100644
--- a/WebCore/dom/Document.h
+++ b/WebCore/dom/Document.h
@@ -125,10 +125,6 @@ class SVGDocumentExtensions;
class TransformSource;
#endif
-#if ENABLE(XBL)
-class XBLBindingManager;
-#endif
-
#if ENABLE(XPATH)
class XPathEvaluator;
class XPathExpression;
@@ -842,11 +838,6 @@ public:
TransformSource* transformSource() const { return m_transformSource.get(); }
#endif
-#if ENABLE(XBL)
- // XBL methods
- XBLBindingManager* bindingManager() const { return m_bindingManager.get(); }
-#endif
-
void incDOMTreeVersion() { ++m_domTreeVersion; }
unsigned domTreeVersion() const { return m_domTreeVersion; }
@@ -1192,10 +1183,6 @@ private:
RefPtr<Document> m_transformSourceDocument;
#endif
-#if ENABLE(XBL)
- OwnPtr<XBLBindingManager> m_bindingManager; // The access point through which documents and elements communicate with XBL.
-#endif
-
typedef HashMap<AtomicStringImpl*, HTMLMapElement*> ImageMapsByName;
ImageMapsByName m_imageMapsByName;
diff --git a/WebCore/loader/Cache.cpp b/WebCore/loader/Cache.cpp
index 521d075..cb536e2 100644
--- a/WebCore/loader/Cache.cpp
+++ b/WebCore/loader/Cache.cpp
@@ -82,10 +82,6 @@ static CachedResource* createResource(CachedResource::Type type, const KURL& url
case CachedResource::XSLStyleSheet:
return new CachedXSLStyleSheet(url.string());
#endif
-#if ENABLE(XBL)
- case CachedResource::XBLStyleSheet:
- return new CachedXBLDocument(url.string());
-#endif
#if ENABLE(LINK_PREFETCH)
case CachedResource::LinkPrefetch:
return new CachedResource(url.string(), CachedResource::LinkPrefetch);
@@ -691,11 +687,6 @@ Cache::Statistics Cache::getStatistics()
case CachedResource::FontResource:
stats.fonts.addResource(resource);
break;
-#if ENABLE(XBL)
- case CachedResource::XBL:
- stats.xblDocs.addResource(resource)
- break;
-#endif
default:
break;
}
diff --git a/WebCore/loader/Cache.h b/WebCore/loader/Cache.h
index bb86e60..763f1f3 100644
--- a/WebCore/loader/Cache.h
+++ b/WebCore/loader/Cache.h
@@ -85,9 +85,6 @@ public:
#if ENABLE(XSLT)
TypeStatistic xslStyleSheets;
#endif
-#if ENABLE(XBL)
- TypeStatistic xblDocs;
-#endif
TypeStatistic fonts;
};
diff --git a/WebCore/loader/CachedResource.h b/WebCore/loader/CachedResource.h
index 4b83a8e..f6eb730 100644
--- a/WebCore/loader/CachedResource.h
+++ b/WebCore/loader/CachedResource.h
@@ -61,9 +61,6 @@ public:
#if ENABLE(XSLT)
, XSLStyleSheet
#endif
-#if ENABLE(XBL)
- , XBL
-#endif
#if ENABLE(LINK_PREFETCH)
, LinkPrefetch
#endif
diff --git a/WebCore/loader/CachedResourceClient.h b/WebCore/loader/CachedResourceClient.h
index 40a6a06..275d331 100644
--- a/WebCore/loader/CachedResourceClient.h
+++ b/WebCore/loader/CachedResourceClient.h
@@ -28,12 +28,6 @@
#include <wtf/FastAllocBase.h>
#include <wtf/Forward.h>
-#if ENABLE(XBL)
-namespace XBL {
- class XBLDocument;
-}
-#endif
-
namespace WebCore {
class CachedCSSStyleSheet;
@@ -68,13 +62,7 @@ namespace WebCore {
virtual void setCSSStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* charset */, const CachedCSSStyleSheet*) { }
virtual void setXSLStyleSheet(const String& /* href */, const KURL& /* baseURL */, const String& /* sheet */) { }
-
virtual void fontLoaded(CachedFont*) {};
-
-#if ENABLE(XBL)
- virtual void setXBLDocument(const String& /*URL*/, XBL::XBLDocument*) { }
-#endif
-
virtual void notifyFinished(CachedResource*) { }
};
diff --git a/WebCore/loader/CachedXBLDocument.cpp b/WebCore/loader/CachedXBLDocument.cpp
deleted file mode 100644
index 0ff17f2..0000000
--- a/WebCore/loader/CachedXBLDocument.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- Copyright (C) 1998 Lars Knoll (knoll at mpi-hd.mpg.de)
- Copyright (C) 2001 Dirk Mueller (mueller at kde.org)
- Copyright (C) 2002 Waldo Bastian (bastian at kde.org)
- Copyright (C) 2006 Samuel Weinig (sam.weinig at gmail.com)
- Copyright (C) 2004, 2005, 2006, 2007, 2008 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
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- This class provides all functionality needed for loading images, style sheets and html
- pages from the web. It has a memory cache for these objects.
-*/
-
-#include "config.h"
-
-#if ENABLE(XBL)
-
-#include "CachedXBLDocument.h"
-
-#include "CachedResourceClientWalker.h"
-#include "TextResourceDecoder.h"
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
-CachedXBLDocument::CachedXBLDocument(const String &url)
-: CachedResource(url, XBL), m_document(0)
-{
- // It's XML we want.
- setAccept("text/xml, application/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+xml");
-
- m_decoder = new TextResourceDecoder("application/xml");
-}
-
-CachedXBLDocument::~CachedXBLDocument()
-{
- if (m_document)
- m_document->deref();
-}
-
-void CachedXBLDocument::ref(CachedResourceClient *c)
-{
- CachedResource::ref(c);
- if (!m_loading)
- c->setXBLDocument(m_url, m_document);
-}
-
-void CachedXBLDocument::setEncoding(const String& chs)
-{
- m_decoder->setEncoding(chs, TextResourceDecoder::EncodingFromHTTPHeader);
-}
-
-String CachedXBLDocument::encoding() const
-{
- return m_decoder->encoding().name();
-}
-
-void CachedXBLDocument::data(Vector<char>& data, bool )
-{
- if (!allDataReceived)
- return;
-
- ASSERT(!m_document);
-
- m_document = new XBL::XBLDocument();
- m_document->ref();
- m_document->open();
-
- m_document->write(m_decoder->decode(data.data(), data.size()));
- setSize(data.size());
-
- m_document->finishParsing();
- m_document->close();
- m_loading = false;
- checkNotify();
-}
-
-void CachedXBLDocument::checkNotify()
-{
- if (m_loading)
- return;
-
- CachedResourceClientWalker w(m_clients);
- while (CachedResourceClient *c = w.next())
- c->setXBLDocument(m_url, m_document);
-}
-
-void CachedXBLDocument::error()
-{
- m_loading = false;
- m_errorOccurred = true;
- checkNotify();
-}
-
-}
-
-#endif
diff --git a/WebCore/loader/CachedXBLDocument.h b/WebCore/loader/CachedXBLDocument.h
deleted file mode 100644
index 9a8d366..0000000
--- a/WebCore/loader/CachedXBLDocument.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- Copyright (C) 1998 Lars Knoll (knoll at mpi-hd.mpg.de)
- Copyright (C) 2001 Dirk Mueller <mueller at kde.org>
- Copyright (C) 2006 Samuel Weinig (sam.weinig at gmail.com)
- Copyright (C) 2004, 2005, 2006, 2007, 2008 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
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-
- This class provides all functionality needed for loading images, style sheets and html
- pages from the web. It has a memory cache for these objects.
-*/
-
-#ifndef CachedXBLDocument_h
-#define CachedXBLDocument_h
-
-#include "CachedResource.h"
-#include <wtf/Vector.h>
-
-namespace WebCore {
- class CachedResource;
- class Request;
- class DocLoader;
- class TextResourceDecoder;
- class CachedResourceClient;
-
-#if ENABLE(XBL)
- class CachedXBLDocument : public CachedResource {
- public:
- CachedXBLDocument(const String& url);
- virtual ~CachedXBLDocument();
-
- XBL::XBLDocument* document() const { return m_document; }
-
- virtual void addClient(CachedResourceClient*);
-
- virtual void setEncoding(const String&);
- virtual String encoding() const;
- virtual void data(Vector<char>&, bool allDataReceived);
- virtual void error();
-
- void checkNotify();
-
- protected:
- XBL::XBLDocument* m_document;
- RefPtr<TextResourceDecoder> m_decoder;
- };
-
-#endif
-
-}
-
-#endif
diff --git a/WebCore/loader/DocLoader.cpp b/WebCore/loader/DocLoader.cpp
index bc102d1..98ed03c 100644
--- a/WebCore/loader/DocLoader.cpp
+++ b/WebCore/loader/DocLoader.cpp
@@ -169,13 +169,6 @@ CachedXSLStyleSheet* DocLoader::requestXSLStyleSheet(const String& url)
}
#endif
-#if ENABLE(XBL)
-CachedXBLDocument* DocLoader::requestXBLDocument(const String& url)
-{
- return static_cast<CachedXSLStyleSheet*>(requestResource(CachedResource::XBL, url, String()));
-}
-#endif
-
#if ENABLE(LINK_PREFETCH)
CachedResource* DocLoader::requestLinkPrefetch(const String& url)
{
@@ -201,11 +194,6 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
break;
#if ENABLE(XSLT)
case CachedResource::XSLStyleSheet:
-#endif
-#if ENABLE(XBL)
- case CachedResource::XBL:
-#endif
-#if ENABLE(XSLT) || ENABLE(XBL)
if (!m_doc->securityOrigin()->canRequest(url)) {
printAccessDeniedMessage(url);
return false;
@@ -229,9 +217,6 @@ bool DocLoader::canRequest(CachedResource::Type type, const KURL& url)
#if ENABLE(XSLT)
case CachedResource::XSLStyleSheet:
#endif
-#if ENABLE(XBL)
- case CachedResource::XBL:
-#endif
// These resource can inject script into the current document.
if (Frame* f = frame())
f->loader()->checkIfRunInsecureContent(m_doc->securityOrigin(), url);
diff --git a/WebCore/loader/DocLoader.h b/WebCore/loader/DocLoader.h
index 138a9f4..05ccaac 100644
--- a/WebCore/loader/DocLoader.h
+++ b/WebCore/loader/DocLoader.h
@@ -64,9 +64,6 @@ public:
#if ENABLE(XSLT)
CachedXSLStyleSheet* requestXSLStyleSheet(const String& url);
#endif
-#if ENABLE(XBL)
- CachedXBLDocument* requestXBLDocument(const String &url);
-#endif
#if ENABLE(LINK_PREFETCH)
CachedResource* requestLinkPrefetch(const String &url);
#endif
diff --git a/WebCore/loader/loader.cpp b/WebCore/loader/loader.cpp
index 7263fc1..345d881 100644
--- a/WebCore/loader/loader.cpp
+++ b/WebCore/loader/loader.cpp
@@ -79,9 +79,6 @@ static ResourceRequest::TargetType cachedResourceTypeToTargetType(CachedResource
#if ENABLE(XSLT)
case CachedResource::XSLStyleSheet:
#endif
-#if ENABLE(XBL)
- case CachedResource::XBL:
-#endif
return ResourceRequest::TargetIsStyleSheet;
case CachedResource::Script:
return ResourceRequest::TargetIsScript;
@@ -106,9 +103,6 @@ Loader::Priority Loader::determinePriority(const CachedResource* resource) const
#if ENABLE(XSLT)
case CachedResource::XSLStyleSheet:
#endif
-#if ENABLE(XBL)
- case CachedResource::XBL:
-#endif
return High;
case CachedResource::Script:
case CachedResource::FontResource:
diff --git a/WebCore/rendering/style/BindingURI.cpp b/WebCore/rendering/style/BindingURI.cpp
deleted file mode 100644
index fd96de4..0000000
--- a/WebCore/rendering/style/BindingURI.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 1999 Antti Koivisto (koivisto at kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 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
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#include "config.h"
-#include "BindingURI.h"
-
-#if ENABLE(XBL)
-
-namespace WebCore {
-
-BindingURI::BindingURI(StringImpl* uri)
- : m_next(0)
-{
- m_uri = uri;
- if (uri)
- uri->ref();
-}
-
-BindingURI::~BindingURI()
-{
- if (m_uri)
- m_uri->deref();
- delete m_next;
-}
-
-BindingURI* BindingURI::copy()
-{
- BindingURI* newBinding = new BindingURI(m_uri);
- if (next()) {
- BindingURI* nextCopy = next()->copy();
- newBinding->setNext(nextCopy);
- }
-
- return newBinding;
-}
-
-bool BindingURI::operator==(const BindingURI& o) const
-{
- if ((m_next && !o.m_next) || (!m_next && o.m_next) ||
- (m_next && o.m_next && *m_next != *o.m_next))
- return false;
-
- if (m_uri == o.m_uri)
- return true;
- if (!m_uri || !o.m_uri)
- return false;
-
- return String(m_uri) == String(o.m_uri);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(XBL)
diff --git a/WebCore/rendering/style/BindingURI.h b/WebCore/rendering/style/BindingURI.h
deleted file mode 100644
index c844b1d..0000000
--- a/WebCore/rendering/style/BindingURI.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2000 Lars Knoll (knoll at kde.org)
- * (C) 2000 Antti Koivisto (koivisto at kde.org)
- * (C) 2000 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
- * Copyright (C) 2006 Graham Dennis (graham.dennis at gmail.com)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef BindingURI_h
-#define BindingURI_h
-#if ENABLE(XBL)
-
-#include <wtf/text/StringImpl.h>
-
-namespace WebCore {
-
-// This struct holds information about shadows for the text-shadow and box-shadow properties.
-
-struct BindingURI {
- BindingURI(StringImpl*);
- ~BindingURI();
-
- BindingURI* copy();
-
- bool operator==(const BindingURI& o) const;
- bool operator!=(const BindingURI& o) const
- {
- return !(*this == o);
- }
-
- BindingURI* next() { return m_next; }
- void setNext(BindingURI* n) { m_next = n; }
-
- StringImpl* uri() { return m_uri; }
-
- BindingURI* m_next;
- StringImpl* m_uri;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(XBL)
-#endif // BindingURI_h
diff --git a/WebCore/rendering/style/RenderStyle.cpp b/WebCore/rendering/style/RenderStyle.cpp
index 5a66c67..aaccbf7 100644
--- a/WebCore/rendering/style/RenderStyle.cpp
+++ b/WebCore/rendering/style/RenderStyle.cpp
@@ -699,20 +699,6 @@ void RenderStyle::applyTransform(TransformationMatrix& transform, const IntSize&
}
}
-#if ENABLE(XBL)
-void RenderStyle::addBindingURI(StringImpl* uri)
-{
- BindingURI* binding = new BindingURI(uri);
- if (!bindingURIs())
- SET_VAR(rareNonInheritedData, bindingURI, binding)
- else
- for (BindingURI* b = bindingURIs(); b; b = b->next()) {
- if (!b->next())
- b->setNext(binding);
- }
-}
-#endif
-
void RenderStyle::setTextShadow(ShadowData* val, bool add)
{
ASSERT(!val || (!val->spread() && val->style() == Normal));
diff --git a/WebCore/rendering/style/RenderStyle.h b/WebCore/rendering/style/RenderStyle.h
index df1b341..e86c5e2 100644
--- a/WebCore/rendering/style/RenderStyle.h
+++ b/WebCore/rendering/style/RenderStyle.h
@@ -87,10 +87,6 @@
#include "SVGRenderStyle.h"
#endif
-#if ENABLE(XBL)
-#include "BindingURI.h"
-#endif
-
#if COMPILER(WINSCW)
#define compareEqual(t, u) ((t) == (u))
#else
@@ -598,9 +594,6 @@ public:
EPageBreak pageBreakAfter() const { return static_cast<EPageBreak>(noninherited_flags._page_break_after); }
// CSS3 Getter Methods
-#if ENABLE(XBL)
- BindingURI* bindingURIs() const { return rareNonInheritedData->bindingURI; }
-#endif
int outlineOffset() const
{
@@ -946,12 +939,6 @@ public:
void setPageBreakAfter(EPageBreak b) { noninherited_flags._page_break_after = b; }
// CSS3 Setters
-#if ENABLE(XBL)
- void deleteBindingURIs() { SET_VAR(rareNonInheritedData, bindingURI, static_cast<BindingURI*>(0)); }
- void inheritBindingURIs(BindingURI* other) { SET_VAR(rareNonInheritedData, bindingURI, other->copy()); }
- void addBindingURI(StringImpl* uri);
-#endif
-
void setOutlineOffset(int v) { SET_VAR(m_background, m_outline.m_offset, v) }
void setTextShadow(ShadowData* val, bool add=false);
void setTextStrokeColor(const Color& c) { SET_VAR(rareInheritedData, textStrokeColor, c) }
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/WebCore/rendering/style/StyleRareNonInheritedData.cpp
index d5c9536..e293984 100644
--- a/WebCore/rendering/style/StyleRareNonInheritedData.cpp
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.cpp
@@ -56,9 +56,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_perspective(RenderStyle::initialPerspective())
, m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
, m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
-#if ENABLE(XBL)
- , bindingURI(0)
-#endif
, m_pageSize()
, m_pageSizeType(PAGE_SIZE_AUTO)
{
@@ -97,9 +94,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_perspective(o.m_perspective)
, m_perspectiveOriginX(o.m_perspectiveOriginX)
, m_perspectiveOriginY(o.m_perspectiveOriginY)
-#if ENABLE(XBL)
- , bindingURI(o.bindingURI ? o.bindingURI->copy() : 0)
-#endif
, m_pageSize(o.m_pageSize)
, m_pageSizeType(o.m_pageSizeType)
{
@@ -109,18 +103,6 @@ StyleRareNonInheritedData::~StyleRareNonInheritedData()
{
}
-#if ENABLE(XBL)
-bool StyleRareNonInheritedData::bindingsEquivalent(const StyleRareNonInheritedData& o) const
-{
- if (this == &o) return true;
- if (!bindingURI && o.bindingURI || bindingURI && !o.bindingURI)
- return false;
- if (bindingURI && o.bindingURI && (*bindingURI != *o.bindingURI))
- return false;
- return true;
-}
-#endif
-
bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
{
return lineClamp == o.lineClamp
@@ -152,9 +134,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& transitionDataEquivalent(o)
&& m_mask == o.m_mask
&& m_maskBoxImage == o.m_maskBoxImage
-#if ENABLE(XBL)
- && bindingsEquivalent(o)
-#endif
&& (m_transformStyle3D == o.m_transformStyle3D)
&& (m_backfaceVisibility == o.m_backfaceVisibility)
&& (m_perspective == o.m_perspective)
diff --git a/WebCore/rendering/style/StyleRareNonInheritedData.h b/WebCore/rendering/style/StyleRareNonInheritedData.h
index 1025d81..6003ea4 100644
--- a/WebCore/rendering/style/StyleRareNonInheritedData.h
+++ b/WebCore/rendering/style/StyleRareNonInheritedData.h
@@ -54,10 +54,6 @@ struct LengthSize;
struct StyleDashboardRegion;
#endif
-#if ENABLE(XBL)
-class BindingURI;
-#endif
-
// Page size type.
// StyleRareNonInheritedData::m_pageSize is meaningful only when
// StyleRareNonInheritedData::m_pageSizeType is PAGE_SIZE_RESOLVED.
@@ -77,10 +73,6 @@ public:
PassRefPtr<StyleRareNonInheritedData> copy() const { return adoptRef(new StyleRareNonInheritedData(*this)); }
~StyleRareNonInheritedData();
-#if ENABLE(XBL)
- bool bindingsEquivalent(const StyleRareNonInheritedData&) const;
-#endif
-
bool operator==(const StyleRareNonInheritedData&) const;
bool operator!=(const StyleRareNonInheritedData& o) const { return !(*this == o); }
@@ -137,10 +129,6 @@ public:
LengthSize m_pageSize;
PageSizeType m_pageSizeType;
-#if ENABLE(XBL)
- OwnPtr<BindingURI> bindingURI; // The XBL binding URI list.
-#endif
-
private:
StyleRareNonInheritedData();
StyleRareNonInheritedData(const StyleRareNonInheritedData&);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list