Merge the chrome_webkit_merge_branch back on to trunk. This brings us

up to webkit@36102.


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2778 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 21 insertions, 6 deletions

diff --git a/webkit/pending/XSLStyleSheet.h b/webkit/pending/XSLStyleSheet.h
index b7b5733..c6ed097 100644
--- a/webkit/pending/XSLStyleSheet.h
+++ b/webkit/pending/XSLStyleSheet.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the XSL implementation.
  *
- * Copyright (C) 2004, 2006 Apple Computer, Inc.
+ * Copyright (C) 2004, 2006, 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
@@ -28,6 +28,7 @@
 #include "StyleSheet.h"
 #include <libxml/parser.h>
 #include <libxslt/transform.h>
+#include <wtf/PassRefPtr.h>
 
 namespace WebCore {
 
@@ -37,9 +38,20 @@ class XSLImportRule;
     
 class XSLStyleSheet : public StyleSheet {
 public:
-    XSLStyleSheet(Node* parentNode, const String& href = String(), bool embedded = false);
-    XSLStyleSheet(XSLImportRule* parentImport, const String& href = String());
-    ~XSLStyleSheet();
+    static PassRefPtr<XSLStyleSheet> create(XSLImportRule* parentImport, const String& href)
+    {
+        return adoptRef(new XSLStyleSheet(parentImport, href));
+    }
+    static PassRefPtr<XSLStyleSheet> create(Node* parentNode, const String& href)
+    {
+        return adoptRef(new XSLStyleSheet(parentNode, href, false));
+    }
+    static PassRefPtr<XSLStyleSheet> createEmbedded(Node* parentNode, const String& href)
+    {
+        return adoptRef(new XSLStyleSheet(parentNode, href, true));
+    }
+
+    virtual ~XSLStyleSheet();
     
     virtual bool isXSLStyleSheet() const { return true; }
 
@@ -51,7 +63,7 @@ public:
     virtual void checkLoaded();
 
     void loadChildSheets();
-    void loadChildSheet(const DeprecatedString& href);
+    void loadChildSheet(const String& href);
 
     xsltStylesheetPtr compileStyleSheet();
 
@@ -72,7 +84,10 @@ public:
     XSLStyleSheet* parentStyleSheet() { return m_parentStyleSheet; }
     void setParentStyleSheet(XSLStyleSheet* parent);
 
-protected:
+private:
+    XSLStyleSheet(Node* parentNode, const String& href, bool embedded);
+    XSLStyleSheet(XSLImportRule* parentImport, const String& href);
+
     Document* m_ownerDocument;
     xmlDocPtr m_stylesheetDoc;
     bool m_embedded;