diff options
Diffstat (limited to 'WebCore/dom/ProcessingInstruction.cpp')
| -rw-r--r-- | WebCore/dom/ProcessingInstruction.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WebCore/dom/ProcessingInstruction.cpp b/WebCore/dom/ProcessingInstruction.cpp index 34b00d4..7486e9a 100644 --- a/WebCore/dom/ProcessingInstruction.cpp +++ b/WebCore/dom/ProcessingInstruction.cpp @@ -1,6 +1,8 @@ -/* +/** + * This file is part of the DOM implementation for KDE. + * * Copyright (C) 2000 Peter Kelly (pmk@post.com) - * Copyright (C) 2006, 2008 Apple Inc. All rights reserved. + * Copyright (C) 2006 Apple Computer, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -17,7 +19,6 @@ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ - #include "config.h" #include "ProcessingInstruction.h" @@ -155,7 +156,7 @@ bool ProcessingInstruction::checkStyleSheet() m_cachedSheet->deref(this); #if ENABLE(XSLT) if (m_isXSL) - m_cachedSheet = document()->docLoader()->requestXSLStyleSheet(document()->completeURL(href).string()); + m_cachedSheet = document()->docLoader()->requestXSLStyleSheet(document()->completeURL(href)); else #endif { @@ -163,7 +164,7 @@ bool ProcessingInstruction::checkStyleSheet() if (charset.isEmpty()) charset = document()->frame()->loader()->encoding(); - m_cachedSheet = document()->docLoader()->requestCSSStyleSheet(document()->completeURL(href).string(), charset); + m_cachedSheet = document()->docLoader()->requestCSSStyleSheet(document()->completeURL(href), charset); } if (m_cachedSheet) m_cachedSheet->ref(this); @@ -196,13 +197,13 @@ bool ProcessingInstruction::sheetLoaded() return false; } -void ProcessingInstruction::setCSSStyleSheet(const String& url, const String& charset, const CachedCSSStyleSheet* sheet) +void ProcessingInstruction::setCSSStyleSheet(const String& url, const String& charset, const String& sheet) { #if ENABLE(XSLT) ASSERT(!m_isXSL); #endif m_sheet = new CSSStyleSheet(this, url, charset); - parseStyleSheet(sheet->sheetText()); + parseStyleSheet(sheet); } #if ENABLE(XSLT) |