3325
|
1 |
--- webkit-1.2.7/WebCore/html/HTMLParser.cpp Fri Sep 10 15:20:33 2010
|
|
2 |
+++ webkit-1.2.7-patch/WebCore/html/HTMLParser.cpp Sat Mar 19 23:16:20 2011
|
|
3 |
@@ -143,7 +143,7 @@
|
2315
|
4 |
, m_handlingResidualStyleAcrossBlocks(false)
|
|
5 |
, m_inStrayTableContent(0)
|
|
6 |
, m_scriptingPermission(FragmentScriptingAllowed)
|
|
7 |
- , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : 0)
|
|
8 |
+ , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : PassOwnPtr<HTMLParserQuirks>(0))
|
|
9 |
{
|
|
10 |
}
|
|
11 |
|
3325
|
12 |
@@ -163,7 +163,7 @@
|
2315
|
13 |
, m_handlingResidualStyleAcrossBlocks(false)
|
|
14 |
, m_inStrayTableContent(0)
|
|
15 |
, m_scriptingPermission(scriptingPermission)
|
|
16 |
- , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : 0)
|
|
17 |
+ , m_parserQuirks(m_document->page() ? m_document->page()->chrome()->client()->createHTMLParserQuirks() : PassOwnPtr<HTMLParserQuirks>(0))
|
|
18 |
{
|
|
19 |
if (frag)
|
|
20 |
frag->ref();
|
3325
|
21 |
--- webkit-1.2.7/WebCore/loader/DocumentLoader.cpp Fri Sep 10 15:20:33 2010
|
|
22 |
+++ webkit-1.2.7-patch/WebCore/loader/DocumentLoader.cpp Sat Mar 19 23:16:20 2011
|
|
23 |
@@ -438,7 +438,7 @@
|
2315
|
24 |
|
|
25 |
PassRefPtr<Archive> DocumentLoader::popArchiveForSubframe(const String& frameName)
|
|
26 |
{
|
|
27 |
- return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : 0;
|
|
28 |
+ return m_archiveResourceCollection ? m_archiveResourceCollection->popSubframeArchive(frameName) : PassRefPtr<Archive>(0);
|
|
29 |
}
|
|
30 |
|
|
31 |
void DocumentLoader::clearArchiveResources()
|
3325
|
32 |
--- webkit-1.2.7/WebCore/editing/markup.cpp Fri Sep 10 15:20:33 2010
|
|
33 |
+++ webkit-1.2.7-patch/WebCore/editing/markup.cpp Sat Mar 19 23:16:20 2011
|
|
34 |
@@ -973,7 +973,7 @@
|
2315
|
35 |
Node* body = enclosingNodeWithTag(Position(commonAncestor, 0), bodyTag);
|
|
36 |
// FIXME: Do this for all fully selected blocks, not just the body.
|
|
37 |
Node* fullySelectedRoot = body && *VisibleSelection::selectionFromContentsOfNode(body).toNormalizedRange() == *updatedRange ? body : 0;
|
|
38 |
- RefPtr<CSSMutableStyleDeclaration> fullySelectedRootStyle = fullySelectedRoot ? styleFromMatchedRulesAndInlineDecl(fullySelectedRoot) : 0;
|
|
39 |
+ RefPtr<CSSMutableStyleDeclaration> fullySelectedRootStyle = fullySelectedRoot ? styleFromMatchedRulesAndInlineDecl(fullySelectedRoot) : PassRefPtr<CSSMutableStyleDeclaration>(0);
|
|
40 |
if (annotate && fullySelectedRoot) {
|
|
41 |
if (shouldIncludeWrapperForFullySelectedRoot(fullySelectedRoot, fullySelectedRootStyle.get()))
|
|
42 |
specialCommonAncestor = fullySelectedRoot;
|
3325
|
43 |
--- webkit-1.2.7/WebCore/editing/CompositeEditCommand.cpp Tue Dec 28 13:24:33 2010
|
|
44 |
+++ webkit-1.2.7-patch/WebCore/editing/CompositeEditCommand.cpp Sat Mar 19 23:16:20 2011
|
|
45 |
@@ -930,7 +930,7 @@
|
2315
|
46 |
|
|
47 |
// FIXME: This is an inefficient way to preserve style on nodes in the paragraph to move. It
|
|
48 |
// shouldn't matter though, since moved paragraphs will usually be quite small.
|
|
49 |
- RefPtr<DocumentFragment> fragment = startOfParagraphToMove != endOfParagraphToMove ? createFragmentFromMarkup(document(), createMarkup(range.get(), 0, DoNotAnnotateForInterchange, true), "") : 0;
|
|
50 |
+ RefPtr<DocumentFragment> fragment = startOfParagraphToMove != endOfParagraphToMove ? createFragmentFromMarkup(document(), createMarkup(range.get(), 0, DoNotAnnotateForInterchange, true), "") : PassRefPtr<DocumentFragment>(0);
|
|
51 |
|
|
52 |
// A non-empty paragraph's style is moved when we copy and move it. We don't move
|
|
53 |
// anything if we're given an empty paragraph, but an empty paragraph can have style
|
3325
|
54 |
--- webkit-1.2.7/WebCore/css/CSSComputedStyleDeclaration.cpp Fri Sep 10 15:20:33 2010
|
|
55 |
+++ webkit-1.2.7-patch/WebCore/css/CSSComputedStyleDeclaration.cpp Sat Mar 19 23:16:20 2011
|
|
56 |
@@ -568,8 +568,8 @@
|
2315
|
57 |
RefPtr<CSSPrimitiveValue> x = CSSPrimitiveValue::create(s->x, CSSPrimitiveValue::CSS_PX);
|
|
58 |
RefPtr<CSSPrimitiveValue> y = CSSPrimitiveValue::create(s->y, CSSPrimitiveValue::CSS_PX);
|
|
59 |
RefPtr<CSSPrimitiveValue> blur = CSSPrimitiveValue::create(s->blur, CSSPrimitiveValue::CSS_PX);
|
|
60 |
- RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? 0 : CSSPrimitiveValue::create(s->spread, CSSPrimitiveValue::CSS_PX);
|
|
61 |
- RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style == Normal ? 0 : CSSPrimitiveValue::createIdentifier(CSSValueInset);
|
|
62 |
+ RefPtr<CSSPrimitiveValue> spread = propertyID == CSSPropertyTextShadow ? PassRefPtr<CSSPrimitiveValue>(0) : CSSPrimitiveValue::create(s->spread, CSSPrimitiveValue::CSS_PX);
|
|
63 |
+ RefPtr<CSSPrimitiveValue> style = propertyID == CSSPropertyTextShadow || s->style == Normal ? PassRefPtr<CSSPrimitiveValue>(0) : CSSPrimitiveValue::createIdentifier(CSSValueInset);
|
|
64 |
RefPtr<CSSPrimitiveValue> color = CSSPrimitiveValue::createColor(s->color.rgb());
|
|
65 |
list->prepend(ShadowValue::create(x.release(), y.release(), blur.release(), spread.release(), style.release(), color.release()));
|
|
66 |
}
|
3325
|
67 |
--- webkit-1.2.7/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp Fri Sep 10 15:20:32 2010
|
|
68 |
+++ webkit-1.2.7-patch/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp Sat Mar 19 23:16:20 2011
|
|
69 |
@@ -48,7 +48,7 @@
|
2315
|
70 |
|
|
71 |
JSValue JSJavaScriptCallFrame::thisObject(ExecState*) const
|
|
72 |
{
|
|
73 |
- return impl()->thisObject() ? impl()->thisObject() : jsNull();
|
|
74 |
+ return impl()->thisObject() ? (JSValue)impl()->thisObject() : jsNull();
|
|
75 |
}
|
|
76 |
|
|
77 |
JSValue JSJavaScriptCallFrame::type(ExecState* exec) const
|
3325
|
78 |
--- webkit-1.2.7/WebCore/loader/icon/IconDatabase.cpp Fri Sep 10 15:20:33 2010
|
|
79 |
+++ webkit-1.2.7-patch/WebCore/loader/icon/IconDatabase.cpp Sat Mar 19 23:16:20 2011
|
|
80 |
@@ -511,7 +511,7 @@
|
2315
|
81 |
if (!isOpen() || iconURLOriginal.isEmpty())
|
|
82 |
return;
|
|
83 |
|
|
84 |
- RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : 0;
|
|
85 |
+ RefPtr<SharedBuffer> data = dataOriginal ? dataOriginal->copy() : (PassRefPtr<SharedBuffer>)0;
|
|
86 |
String iconURL = iconURLOriginal.crossThreadString();
|
|
87 |
|
|
88 |
Vector<String> pageURLs;
|
3325
|
89 |
--- webkit-1.2.7/WebCore/loader/archive/ArchiveResource.cpp Fri Sep 10 15:20:33 2010
|
|
90 |
+++ webkit-1.2.7-patch/WebCore/loader/archive/ArchiveResource.cpp Sat Mar 19 23:16:20 2011
|
|
91 |
@@ -35,17 +35,17 @@
|
2315
|
92 |
|
|
93 |
PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
|
|
94 |
{
|
|
95 |
- return data ? adoptRef(new ArchiveResource(data, url, response)) : 0;
|
|
96 |
+ return data ? adoptRef(new ArchiveResource(data, url, response)) : PassRefPtr<ArchiveResource>(0);
|
|
97 |
}
|
|
98 |
|
|
99 |
PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const String& mimeType, const String& textEncoding, const String& frameName)
|
|
100 |
{
|
|
101 |
- return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName)) : 0;
|
|
102 |
+ return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName)) : PassRefPtr<ArchiveResource>(0);
|
|
103 |
}
|
|
104 |
|
|
105 |
PassRefPtr<ArchiveResource> ArchiveResource::create(PassRefPtr<SharedBuffer> data, const KURL& url, const String& mimeType, const String& textEncoding, const String& frameName, const ResourceResponse& resourceResponse)
|
|
106 |
{
|
|
107 |
- return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse)) : 0;
|
|
108 |
+ return data ? adoptRef(new ArchiveResource(data, url, mimeType, textEncoding, frameName, resourceResponse)) : PassRefPtr<ArchiveResource>(0);
|
|
109 |
}
|
|
110 |
|
|
111 |
ArchiveResource::ArchiveResource(PassRefPtr<SharedBuffer> data, const KURL& url, const ResourceResponse& response)
|
3325
|
112 |
--- webkit-1.2.7/WebCore/loader/archive/ArchiveFactory.cpp Fri Mar 19 16:20:54 2010
|
|
113 |
+++ webkit-1.2.7-patch/WebCore/loader/archive/ArchiveFactory.cpp Sat Mar 19 23:16:20 2011
|
|
114 |
@@ -76,7 +76,7 @@
|
2315
|
115 |
PassRefPtr<Archive> ArchiveFactory::create(SharedBuffer* data, const String& mimeType)
|
|
116 |
{
|
|
117 |
RawDataCreationFunction* function = archiveMIMETypes().get(mimeType);
|
|
118 |
- return function ? function(data) : 0;
|
|
119 |
+ return function ? function(data) : PassRefPtr<Archive>(0);
|
|
120 |
}
|
|
121 |
|
|
122 |
void ArchiveFactory::registerKnownArchiveMIMETypes()
|
3325
|
123 |
--- webkit-1.2.7/WebCore/page/animation/AnimationBase.cpp Fri Sep 10 15:20:33 2010
|
|
124 |
+++ webkit-1.2.7-patch/WebCore/page/animation/AnimationBase.cpp Sat Mar 19 23:16:20 2011
|
|
125 |
@@ -153,7 +153,7 @@
|
2315
|
126 |
for (unsigned i = 0; i < size; i++) {
|
|
127 |
RefPtr<TransformOperation> fromOp = (i < fromSize) ? from.operations()[i].get() : 0;
|
|
128 |
RefPtr<TransformOperation> toOp = (i < toSize) ? to.operations()[i].get() : 0;
|
|
129 |
- RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : 0);
|
|
130 |
+ RefPtr<TransformOperation> blendedOp = toOp ? toOp->blend(fromOp.get(), progress) : (fromOp ? fromOp->blend(0, progress, true) : PassRefPtr<TransformOperation>(0));
|
|
131 |
if (blendedOp)
|
|
132 |
result.operations().append(blendedOp);
|
|
133 |
else {
|
3325
|
134 |
--- webkit-1.2.7/WebCore/rendering/RenderLayer.cpp Fri Sep 10 15:20:33 2010
|
|
135 |
+++ webkit-1.2.7-patch/WebCore/rendering/RenderLayer.cpp Sat Mar 19 23:16:20 2011
|
|
136 |
@@ -3427,7 +3427,7 @@
|
2315
|
137 |
void RenderLayer::updateScrollCornerStyle()
|
|
138 |
{
|
|
139 |
RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
|
|
140 |
- RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : 0;
|
|
141 |
+ RefPtr<RenderStyle> corner = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(SCROLLBAR_CORNER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
|
|
142 |
if (corner) {
|
|
143 |
if (!m_scrollCorner) {
|
|
144 |
m_scrollCorner = new (renderer()->renderArena()) RenderScrollbarPart(renderer()->document());
|
3325
|
145 |
@@ -3443,7 +3443,7 @@
|
2315
|
146 |
void RenderLayer::updateResizerStyle()
|
|
147 |
{
|
|
148 |
RenderObject* actualRenderer = renderer()->node() ? renderer()->node()->shadowAncestorNode()->renderer() : renderer();
|
|
149 |
- RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : 0;
|
|
150 |
+ RefPtr<RenderStyle> resizer = renderer()->hasOverflowClip() ? actualRenderer->getUncachedPseudoStyle(RESIZER, actualRenderer->style()) : PassRefPtr<RenderStyle>(0);
|
|
151 |
if (resizer) {
|
|
152 |
if (!m_resizer) {
|
|
153 |
m_resizer = new (renderer()->renderArena()) RenderScrollbarPart(renderer()->document());
|
3325
|
154 |
--- webkit-1.2.7/WebCore/rendering/RenderScrollbar.cpp Fri Sep 10 15:20:33 2010
|
|
155 |
+++ webkit-1.2.7-patch/WebCore/rendering/RenderScrollbar.cpp Sat Mar 19 23:16:20 2011
|
|
156 |
@@ -199,7 +199,7 @@
|
2315
|
157 |
if (partType == NoPart)
|
|
158 |
return;
|
|
159 |
|
|
160 |
- RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType)) : 0;
|
|
161 |
+ RefPtr<RenderStyle> partStyle = !destroy ? getScrollbarPseudoStyle(partType, pseudoForScrollbarPart(partType)) : PassRefPtr<RenderStyle>(0);
|
|
162 |
|
|
163 |
bool needRenderer = !destroy && partStyle && partStyle->display() != NONE && partStyle->visibility() == VISIBLE;
|
|
164 |
|
3325
|
165 |
--- webkit-1.2.7/WebCore/rendering/RenderTextFragment.cpp Fri Sep 10 15:20:33 2010
|
|
166 |
+++ webkit-1.2.7-patch/WebCore/rendering/RenderTextFragment.cpp Sat Mar 19 23:16:20 2011
|
2315
|
167 |
@@ -28,7 +28,7 @@
|
|
168 |
namespace WebCore {
|
|
169 |
|
|
170 |
RenderTextFragment::RenderTextFragment(Node* node, StringImpl* str, int startOffset, int length)
|
|
171 |
- : RenderText(node, str ? str->substring(startOffset, length) : 0)
|
|
172 |
+ : RenderText(node, str ? str->substring(startOffset, length) : PassRefPtr<StringImpl>(0))
|
|
173 |
, m_start(startOffset)
|
|
174 |
, m_end(length)
|
|
175 |
, m_firstLetter(0)
|
3325
|
176 |
--- webkit-1.2.7/WebCore/loader/appcache/ApplicationCacheGroup.cpp Fri Sep 10 15:20:33 2010
|
|
177 |
+++ webkit-1.2.7-patch/WebCore/loader/appcache/ApplicationCacheGroup.cpp Sat Mar 19 23:16:20 2011
|
|
178 |
@@ -775,7 +775,7 @@
|
2315
|
179 |
ASSERT(cacheStorage().isMaximumSizeReached() && m_calledReachedMaxAppCacheSize);
|
|
180 |
}
|
|
181 |
|
|
182 |
- RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? 0 : m_newestCache;
|
|
183 |
+ RefPtr<ApplicationCache> oldNewestCache = (m_newestCache == m_cacheBeingUpdated) ? RefPtr<ApplicationCache>(0) : m_newestCache;
|
|
184 |
|
|
185 |
setNewestCache(m_cacheBeingUpdated.release());
|
|
186 |
if (cacheStorage().storeNewestCache(this)) {
|
3325
|
187 |
--- webkit-1.2.7/WebCore/svg/SVGElement.cpp Mon Feb 7 18:29:58 2011
|
|
188 |
+++ webkit-1.2.7-patch/WebCore/svg/SVGElement.cpp Sat Mar 19 23:16:20 2011
|
|
189 |
@@ -280,7 +280,7 @@
|
2315
|
190 |
event->setTarget(currentTarget);
|
|
191 |
currentTarget->dispatchGenericEvent(event.release());
|
|
192 |
}
|
|
193 |
- currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : 0;
|
|
194 |
+ currentTarget = (parent && parent->isSVGElement()) ? static_pointer_cast<SVGElement>(parent) : RefPtr<SVGElement>(0);
|
|
195 |
}
|
|
196 |
}
|
|
197 |
|