Changeset 79805 in webkit


Ignore:
Timestamp:
Feb 26, 2011 12:14:47 PM (13 years ago)
Author:
pfeldman@chromium.org
Message:

2011-02-26 Pavel Feldman <​pfeldman@chromium.org>

Not reviewed: rolling out 79799 and 79804 for breaking xml tests on mac.

Location:
trunk
Files:
31 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r79804 r79805  
     12011-02-26  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Not reviewed: rolling out 79799 and 79804 for breaking xml tests on mac.
     4
    152011-02-26  Pavel Feldman  <pfeldman@chromium.org>
    26

  • trunk/LayoutTests/platform/qt/Skipped

    r79804 r79805  
    36123612http/tests/inspector-enabled/open-close-open.html
    36133613http/tests/inspector/change-iframe-src.html
    3614 
    3615 # [Qt] XML Viewer fails due to specifics in the parser implementation
    3616 # https://bugs.webkit.org/show_bug.cgi?id=55302
    3617 http/tests/xmlviewer/dumpAsText/svg.xml
    3618 http/tests/xmlviewer/dumpAsText/wml.xml
    3619 http/tests/xmlviewer/dumpAsText/xlink.xml
    3620 http/tests/xmlviewer/dumpAsText/xmlviewer-charset-cp1251.xml
    3621 http/tests/xmlviewer/dumpAsText/xmlviewer-charset-utf8.xml
    3622 http/tests/xmlviewer/dumpAsText/xmlviewer.xml
    3623 http/tests/xmlviewer/dumpAsText/xsl-stylesheet.xml
    3624 http/tests/xmlviewer/dumpAsText/xul.xml

  • trunk/Source/WebCore/CMakeLists.txt

    r79804 r79805  
    15061506    xml/XMLHttpRequestProgressEventThrottle.cpp
    15071507    xml/XMLHttpRequestUpload.cpp
    1508     xml/XMLTreeViewer.cpp
    15091508    xml/XMLSerializer.cpp
    15101509    xml/XPathEvaluator.cpp
    … …  
    21422141
    21432142
    2144 # Generate XMLViewerXSL.h
    2145 ADD_CUSTOM_COMMAND(
    2146     OUTPUT ${DERIVED_SOURCES_DIR}/XMLViewerXSL.h
    2147     MAIN_DEPENDENCY xml/XMLViewer.xsl
    2148     COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/inspector/xxd.pl XMLViewer_xsl ${WEBCORE_DIR}/xml/XMLViewer.xsl ${DERIVED_SOURCES_DIR}/XMLViewerXSL.h
    2149     VERBATIM)
    2150 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XMLViewerXSL.h)
    2151 
    2152 
    21532143# Generate HTML entity table
    21542144ADD_CUSTOM_COMMAND(

  • trunk/Source/WebCore/ChangeLog

    r79804 r79805  
     12011-02-26  Pavel Feldman  <pfeldman@chromium.org>
     2
     3        Not reviewed: rolling out 79799 and 79804 for breaking xml tests on mac.
     4
    152011-02-26  Pavel Feldman  <pfeldman@chromium.org>
    26

  • trunk/Source/WebCore/DerivedSources.make

    r79799 r79805  
    649649# --------
    650650
    651 # XMLViewer XSLT
    652 
    653 all : XMLViewerXSL.h
    654 
    655 XMLViewerXSL.h : xml/XMLViewer.xsl
    656         perl $(WebCore)/inspector/xxd.pl XMLViewer_xsl $(WebCore)/xml/XMLViewer.xsl XMLViewerXSL.h
    657 
    658 # --------
    659 
    660651# HTML entity names
    661652

  • trunk/Source/WebCore/GNUmakefile.am

    r79799 r79805  
    647647        DerivedSources/WebCore/XMLNames.h \
    648648        DerivedSources/WebCore/XMLNSNames.cpp \
    649         DerivedSources/WebCore/XMLNSNames.h \
    650         DerivedSources/WebCore/XMLViewerXSL.h
     649        DerivedSources/WebCore/XMLNSNames.h
    651650
    652651webcore_sources += \
    … …  
    36293628        Source/WebCore/xml/XMLHttpRequestUpload.cpp \
    36303629        Source/WebCore/xml/XMLHttpRequestUpload.h \
    3631         Source/WebCore/xml/XMLTreeViewer.cpp \
    3632         Source/WebCore/xml/XMLTreeViewer.h \
    36333630        Source/WebCore/xml/XMLSerializer.cpp \
    36343631        Source/WebCore/xml/XMLSerializer.h \
    … …  
    48644861        $(PERL) $(WebCore)/make-hash-tools.pl $(GENSOURCES_WEBCORE) $(WebCore)/html/DocTypeStrings.gperf
    48654862
    4866 # XML Viewer XSL
    4867 DerivedSources/WebCore/XMLViewerXSL.h: $(WebCore)/xml/XMLViewer.xsl
    4868         $(PERL) $(WebCore)/inspector/xxd.pl XMLViewer_xsl $(WebCore)/xml/XMLViewer.xsl $(GENSOURCES_WEBCORE)/XMLViewerXSL.h
    4869 
    48704863# HTML entity names
    48714864DerivedSources/WebCore/HTMLEntityTable.cpp: $(WebCore)/html/parser/HTMLEntityNames.in $(WebCore)/html/parser/create-html-entity-table

  • trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

    r79799 r79805  
    388388        # Actions to build derived sources.
    389389        {
    390           'action_name': 'generateXMLViewerXSL',
    391           'inputs': [
    392             '../xml/XMLViewer.xsl',
    393           ],
    394           'outputs': [
    395             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLViewerXSL.h',
    396             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLViewerXSL.cpp',
    397           ],
    398           'action': [
    399             'perl',
    400             '../inspector/xxd.pl',
    401             'XMLViewer_xsl',
    402             '../xml/XMLViewer.xsl',
    403             '<(SHARED_INTERMEDIATE_DIR)/webkit/XMLViewerXSL.h'
    404           ],
    405         },
    406         {
    407390          'action_name': 'HTMLEntityTable',
    408391          'inputs': [

  • trunk/Source/WebCore/WebCore.gypi

    r79799 r79805  
    46434643            'xml/XMLHttpRequestUpload.cpp',
    46444644            'xml/XMLHttpRequestUpload.h',
    4645             'xml/XMLTreeViewer.cpp',
    4646             'xml/XMLTreeViewer.h',
    46474645            'xml/XMLSerializer.cpp',
    46484646            'xml/XMLSerializer.h',

  • trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj

    r79799 r79805  
    2303923039                        </File>
    2304023040                        <File
    23041                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XMLViewerXSL.h"
    23042                                 >
    23043                         </File>
    23044                         <File
    2304523041                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\XPathGrammar.cpp"
    2304623042                                >
    … …  
    4100140997                        </File>
    4100240998                        <File
    41003                                 RelativePath="..\xml\XMLTreeViewer.cpp"
    41004                                 >
    41005                         </File>
    41006                         <File
    41007                                 RelativePath="..\xml\XMLTreeViewer.h"
    41008                                 >
    41009                         </File>
    41010                         <File
    4101140999                                RelativePath="..\xml\XMLSerializer.cpp"
    4101241000                                >

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r79799 r79805  
    13671367                550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
    13681368                550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
    1369                 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */; };
    1370                 5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */ = {isa = PBXBuildFile; fileRef = 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */; };
    13711369                590E1B4911E4EF4B0069F784 /* DeviceOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */; settings = {ATTRIBUTES = (Private, ); }; };
    13721370                590E1B4B11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */; };
    … …  
    78237821                550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    78247822                550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
    7825                 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XMLTreeViewer.cpp; sourceTree = "<group>"; };
    7826                 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLTreeViewer.h; sourceTree = "<group>"; };
    78277823                590E1B4811E4EF4B0069F784 /* DeviceOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceOrientation.h; sourceTree = "<group>"; };
    78287824                590E1B4A11E4EF700069F784 /* JSDeviceOrientationEventCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDeviceOrientationEventCustom.cpp; sourceTree = "<group>"; };
    … …  
    78337829                596229771133EFD700DC4CBB /* GeolocationPositionCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeolocationPositionCache.cpp; sourceTree = "<group>"; };
    78347830                596229791133EFE200DC4CBB /* GeolocationPositionCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeolocationPositionCache.h; sourceTree = "<group>"; };
    7835                 5980B03312EF3D8400DF5F85 /* XMLViewer.xsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = XMLViewer.xsl; sourceTree = "<group>"; };
    78367831                599E758F11055A1F00D904FA /* Bridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Bridge.h; path = bridge/Bridge.h; sourceTree = "<group>"; };
    78377832                59A85EA1119D68D900DEF1EF /* DeviceOrientationEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DeviceOrientationEvent.cpp; sourceTree = "<group>"; };
    … …  
    1843018425                                BCDFD48C0E305290009D10AD /* XMLHttpRequestUpload.h */,
    1843118426                                BCDFD4900E305644009D10AD /* XMLHttpRequestUpload.idl */,
    18432                                 5905ADBD1302F3CE00F116DF /* XMLTreeViewer.cpp */,
    18433                                 5905ADBE1302F3CE00F116DF /* XMLTreeViewer.h */,
    1843418427                                1ACE53E40A8D18E70022947D /* XMLSerializer.cpp */,
    1843518428                                1ACE53E50A8D18E70022947D /* XMLSerializer.h */,
    1843618429                                1ACE53E60A8D18E70022947D /* XMLSerializer.idl */,
    18437                                 5980B03312EF3D8400DF5F85 /* XMLViewer.xsl */,
    1843818430                                1AB7FC470A8B92EC00D9D37B /* XPathEvaluator.cpp */,
    1843918431                                1AB7FC480A8B92EC00D9D37B /* XPathEvaluator.h */,
    … …  
    2247022462                                E15A36D71104572000B7B639 /* XMLNSNames.h in Headers */,
    2247122463                                1ACE53EB0A8D18E70022947D /* XMLSerializer.h in Headers */,
    22472                                 5905ADC01302F3CE00F116DF /* XMLTreeViewer.h in Headers */,
    2247322464                                1AB7FC690A8B92EC00D9D37B /* XPathEvaluator.h in Headers */,
    2247422465                                BC60DA5B0D2A31F700B9918F /* XPathException.h in Headers */,
    … …  
    2511525106                                E15A36D91104572700B7B639 /* XMLNSNames.cpp in Sources */,
    2511625107                                1ACE53EA0A8D18E70022947D /* XMLSerializer.cpp in Sources */,
    25117                                 5905ADBF1302F3CE00F116DF /* XMLTreeViewer.cpp in Sources */,
    2511825108                                1AB7FC680A8B92EC00D9D37B /* XPathEvaluator.cpp in Sources */,
    2511925109                                1AB7FC6B0A8B92EC00D9D37B /* XPathExpression.cpp in Sources */,

  • trunk/Source/WebCore/css/CSSStyleSelector.cpp

    r79799 r79805  
    12531253        matchRules(defaultQuirksStyle, firstUARule, lastUARule, false);
    12541254       
    1255     // If document uses view source styles (in view source mode or in xml viewer mode), then we match rules from the view source style sheet.
    1256     if (m_checker.m_document->usesViewSourceStyles()) {
     1255    // If we're in view source mode, then we match rules from the view source style sheet.
     1256    if (m_checker.m_document->frame() && m_checker.m_document->frame()->inViewSourceMode()) {
    12571257        if (!defaultViewSourceStyle)
    12581258            loadViewSourceStyle();

  • trunk/Source/WebCore/dom/Document.cpp

    r79799 r79805  
    410410    , m_isXHTML(isXHTML)
    411411    , m_isHTML(isHTML)
    412     , m_usesViewSourceStyles(false)
    413     , m_sawElementsInKnownNamespaces(false)
    414412    , m_numNodeListCaches(0)
    415413#if USE(JSC)
    … …  
    962960#endif
    963961
    964     if (e)
    965         m_sawElementsInKnownNamespaces = true;
    966     else
     962    if (!e)
    967963        e = Element::create(qName, document());
    968964

  • trunk/Source/WebCore/dom/Document.h

    r79799 r79805  
    436436   
    437437    CSSStyleSelector* styleSelectorIfExists() const { return m_styleSelector.get(); }
    438 
    439     bool usesViewSourceStyles() const { return m_usesViewSourceStyles; }
    440     void setUsesViewSourceStyles(bool usesViewSourceStyles) { m_usesViewSourceStyles = usesViewSourceStyles; }
    441 
    442     bool sawElementsInKnownNamespaces() const { return m_sawElementsInKnownNamespaces; }
    443 
    444438    CSSStyleSelector* styleSelector()
    445439    {
    … …  
    13771371    bool m_isHTML;
    13781372
    1379     bool m_usesViewSourceStyles;
    1380     bool m_sawElementsInKnownNamespaces;
    1381 
    13821373    unsigned m_numNodeListCaches;
    13831374

  • trunk/Source/WebCore/dom/XMLDocumentParser.h

    r79799 r79805  
    195195
    196196        bool m_sawError;
    197         bool m_sawCSS;
    198197        bool m_sawXSLTransform;
    199198        bool m_sawFirstElement;

  • trunk/Source/WebCore/dom/XMLDocumentParserLibxml2.cpp

    r79799 r79805  
    6464
    6565#if ENABLE(XSLT)
    66 #include "XMLTreeViewer.h"
    6766#include <libxslt/xslt.h>
    6867#endif
    6968
    7069#if ENABLE(XHTMLMP)
     70#include "HTMLNames.h"
    7171#include "HTMLScriptElement.h"
    7272#endif
    73 
    7473
    7574using namespace std;
    … …  
    550549    , m_currentNode(document)
    551550    , m_sawError(false)
    552     , m_sawCSS(false)
    553551    , m_sawXSLTransform(false)
    554552    , m_sawFirstElement(false)
    … …  
    577575    , m_currentNode(fragment)
    578576    , m_sawError(false)
    579     , m_sawCSS(false)
    580577    , m_sawXSLTransform(false)
    581578    , m_sawFirstElement(false)
    … …  
    971968
    972969    // ### handle exceptions
    973     ExceptionCode ec = 0;
     970    int exception = 0;
    974971    RefPtr<ProcessingInstruction> pi = document()->createProcessingInstruction(
    975         toString(target), toString(data), ec);
    976     if (ec)
     972        toString(target), toString(data), exception);
     973    if (exception)
    977974        return;
    978975
    … …  
    985982    pi->finishParsingChildren();
    986983
    987     if (pi->isCSS())
    988         m_sawCSS = true;
    989984#if ENABLE(XSLT)
    990985    m_sawXSLTransform = !m_sawFirstElement && pi->isXSL();
    … …  
    13131308    DocumentParser::startParsing();
    13141309    m_sawError = false;
    1315     m_sawCSS = false;
    13161310    m_sawXSLTransform = false;
    13171311    m_sawFirstElement = false;
    … …  
    13291323{
    13301324#if ENABLE(XSLT)
    1331     XMLTreeViewer xmlTreeViewer(document());
    1332 
    1333     bool xmlViewerMode = !m_sawError && !m_sawCSS && !m_sawXSLTransform && xmlTreeViewer.hasNoStyleInformation();
    1334 
    1335     if (xmlViewerMode || m_sawXSLTransform) {
     1325    if (m_sawXSLTransform) {
    13361326        void* doc = xmlDocPtrForString(document()->cachedResourceLoader(), m_originalSourceForTransform, document()->url().string());
    13371327        document()->setTransformSource(new TransformSource(doc));
    13381328
    1339         if (xmlViewerMode)
    1340             xmlTreeViewer.transformDocumentToTreeView();
    1341         else {
    1342             document()->setParsing(false); // Make the document think it's done, so it will apply XSL stylesheets.
    1343             document()->styleSelectorChanged(RecalcStyleImmediately);
    1344             document()->setParsing(true);
    1345         }
    1346 
     1329        document()->setParsing(false); // Make the doc think it's done, so it will apply xsl sheets.
     1330        document()->styleSelectorChanged(RecalcStyleImmediately);
     1331        document()->setParsing(true);
    13471332        DocumentParser::stopParsing();
    13481333    }

  • trunk/Source/WebCore/dom/XMLDocumentParserQt.cpp

    r79799 r79805  
    9292    , m_currentNode(document)
    9393    , m_sawError(false)
    94     , m_sawCSS(false)
    9594    , m_sawXSLTransform(false)
    9695    , m_sawFirstElement(false)
    … …  
    119118    , m_currentNode(fragment)
    120119    , m_sawError(false)
    121     , m_sawCSS(false)
    122120    , m_sawXSLTransform(false)
    123121    , m_sawFirstElement(false)
    … …  
    208206    DocumentParser::startParsing();
    209207    m_sawError = false;
    210     m_sawCSS = false;
    211208    m_sawXSLTransform = false;
    212209    m_sawFirstElement = false;
    … …  
    644641    pi->finishParsingChildren();
    645642
    646     if (pi->isCSS())
    647         m_sawCSS = true;
    648643#if ENABLE(XSLT)
    649644    m_sawXSLTransform = !m_sawFirstElement && pi->isXSL();

  • trunk/Source/WebCore/html/HTMLViewSourceDocument.cpp

    r79799 r79805  
    5353{
    5454    setUsesBeforeAfterRules(true);
    55     setUsesViewSourceStyles(true);
    56 
    5755    setCompatibilityMode(QuirksMode);
    5856    lockCompatibilityMode();

  • trunk/Source/WebCore/xml/XSLStyleSheet.h

    r79799 r79805  
    6464    }
    6565
    66     static PassRefPtr<XSLStyleSheet> createForXMLTreeViewer(Node* node, const String& sheetString)
    67     {
    68         RefPtr<XSLStyleSheet> sheet = adoptRef(new XSLStyleSheet(node, String(), KURL(), false));
    69         sheet->parseString(sheetString);
    70 
    71         return sheet.release();
    72     }
    73 
    7466    virtual ~XSLStyleSheet();
    7567   
Note: See TracChangeset for help on using the changeset viewer.