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