[webkit-changes] cvs commit: WebCore/khtml/xml dom_docimpl.cpp dom_docimpl.h

Adele adele at opensource.apple.com
Tue Jul 12 13:50:37 PDT 2005


adele       05/07/12 13:50:37

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/html Tag: Safari-2-0-branch html_baseimpl.cpp
                        html_elementimpl.h html_tableimpl.cpp
               khtml/xml Tag: Safari-2-0-branch dom_docimpl.cpp
                        dom_docimpl.h
  Log:
          Merged fix from TOT to Safari-2-0-branch
          <rdar://problem/4164953>
  
      2005-04-21  David Hyatt  <hyatt at apple.com>
  
  	Fix for 4095839, wrong background image used on flechtwerk.de.  Make sure that the global mapped
  	attribute cache hashed background attributes into per-document buckets.
  
          * khtml/html/html_baseimpl.cpp:
          (HTMLBodyElementImpl::mapToEntry):
          * khtml/html/html_elementimpl.h:
          (DOM::):
          * khtml/html/html_tableimpl.cpp:
          (HTMLTableElementImpl::mapToEntry):
          (HTMLTablePartElementImpl::mapToEntry):
          * khtml/xml/dom_docimpl.cpp:
          (DocumentImpl::DocumentImpl):
          * khtml/xml/dom_docimpl.h:
          (DOM::DocumentImpl::docID):
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4104.2.53 +22 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.4104.2.52
  retrieving revision 1.4104.2.53
  diff -u -r1.4104.2.52 -r1.4104.2.53
  --- ChangeLog	12 Jul 2005 20:25:59 -0000	1.4104.2.52
  +++ ChangeLog	12 Jul 2005 20:50:29 -0000	1.4104.2.53
  @@ -1,6 +1,28 @@
   2005-07-12  Adele Peterson  <adele at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  +        <rdar://problem/4164953>
  +
  +    2005-04-21  David Hyatt  <hyatt at apple.com>
  +
  +	Fix for 4095839, wrong background image used on flechtwerk.de.  Make sure that the global mapped
  +	attribute cache hashed background attributes into per-document buckets.
  +
  +        * khtml/html/html_baseimpl.cpp:
  +        (HTMLBodyElementImpl::mapToEntry):
  +        * khtml/html/html_elementimpl.h:
  +        (DOM::):
  +        * khtml/html/html_tableimpl.cpp:
  +        (HTMLTableElementImpl::mapToEntry):
  +        (HTMLTablePartElementImpl::mapToEntry):
  +        * khtml/xml/dom_docimpl.cpp:
  +        (DocumentImpl::DocumentImpl):
  +        * khtml/xml/dom_docimpl.h:
  +        (DOM::DocumentImpl::docID):
  +
  +2005-07-12  Adele Peterson  <adele at apple.com>
  +
  +        Merged fix from TOT to Safari-2-0-branch
           <rdar://problem/4164952>
   
       2005-05-30  Darin Adler  <darin at apple.com>
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.68.8.2  +2 -0      WebCore/khtml/html/html_baseimpl.cpp
  
  Index: html_baseimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
  retrieving revision 1.68.8.1
  retrieving revision 1.68.8.2
  diff -u -r1.68.8.1 -r1.68.8.2
  --- html_baseimpl.cpp	12 Jul 2005 19:04:06 -0000	1.68.8.1
  +++ html_baseimpl.cpp	12 Jul 2005 20:50:35 -0000	1.68.8.2
  @@ -81,6 +81,8 @@
       switch(attr)
       {
           case ATTR_BACKGROUND:
  +            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +            return false;
           case ATTR_BGCOLOR:
           case ATTR_TEXT:
           case ATTR_MARGINWIDTH:
  
  
  
  1.32.8.1  +1 -1      WebCore/khtml/html/html_elementimpl.h
  
  Index: html_elementimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_elementimpl.h,v
  retrieving revision 1.32
  retrieving revision 1.32.8.1
  diff -u -r1.32 -r1.32.8.1
  --- html_elementimpl.h	19 Mar 2005 00:34:06 -0000	1.32
  +++ html_elementimpl.h	12 Jul 2005 20:50:35 -0000	1.32.8.1
  @@ -36,7 +36,7 @@
   class DocumentFragmentImpl;
   
   enum MappedAttributeEntry { eNone, eUniversal, ePersistent, eReplaced, eBlock, eHR, eUnorderedList, eListItem,
  -    eTable, eCell, eCaption };
  +    eTable, eCell, eCaption, eLastEntry };
   
   class CSSMappedAttributeDeclarationImpl : public CSSMutableStyleDeclarationImpl
   {
  
  
  
  1.49.8.1  +6 -2      WebCore/khtml/html/html_tableimpl.cpp
  
  Index: html_tableimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_tableimpl.cpp,v
  retrieving revision 1.49
  retrieving revision 1.49.8.1
  diff -u -r1.49 -r1.49.8.1
  --- html_tableimpl.cpp	15 Dec 2004 02:41:38 -0000	1.49
  +++ html_tableimpl.cpp	12 Jul 2005 20:50:35 -0000	1.49.8.1
  @@ -365,10 +365,12 @@
   bool HTMLTableElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
   {
       switch(attr) {
  +        case ATTR_BACKGROUND:
  +            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +            return false;
           case ATTR_WIDTH:
           case ATTR_HEIGHT:
           case ATTR_BGCOLOR:
  -        case ATTR_BACKGROUND:
           case ATTR_CELLSPACING:
           case ATTR_VSPACE:
           case ATTR_HSPACE:
  @@ -622,8 +624,10 @@
   bool HTMLTablePartElementImpl::mapToEntry(NodeImpl::Id attr, MappedAttributeEntry& result) const
   {
       switch(attr) {
  -        case ATTR_BGCOLOR:
           case ATTR_BACKGROUND:
  +            result = (MappedAttributeEntry)(eLastEntry + getDocument()->docID());
  +            return false;
  +        case ATTR_BGCOLOR:
           case ATTR_BORDERCOLOR:
           case ATTR_VALIGN:
           case ATTR_HEIGHT:
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.211.6.6 +3 -0      WebCore/khtml/xml/dom_docimpl.cpp
  
  Index: dom_docimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.cpp,v
  retrieving revision 1.211.6.5
  retrieving revision 1.211.6.6
  diff -u -r1.211.6.5 -r1.211.6.6
  --- dom_docimpl.cpp	12 Jul 2005 18:29:05 -0000	1.211.6.5
  +++ dom_docimpl.cpp	12 Jul 2005 20:50:36 -0000	1.211.6.6
  @@ -368,6 +368,9 @@
       m_jsEditor = 0;
   
       m_markers.setAutoDelete(true);
  +    
  +    static int docID = 0;
  +    m_docID = docID++;
   }
   
   DocumentImpl::~DocumentImpl()
  
  
  
  1.104.6.4 +4 -0      WebCore/khtml/xml/dom_docimpl.h
  
  Index: dom_docimpl.h
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/xml/dom_docimpl.h,v
  retrieving revision 1.104.6.3
  retrieving revision 1.104.6.4
  diff -u -r1.104.6.3 -r1.104.6.4
  --- dom_docimpl.h	12 Jul 2005 18:29:05 -0000	1.104.6.3
  +++ dom_docimpl.h	12 Jul 2005 20:50:36 -0000	1.104.6.4
  @@ -571,6 +571,8 @@
       DocumentImpl *parentDocument() const;
       DocumentImpl *topDocument() const;
   
  +    int docID() const { return m_docID; }
  +
   #ifdef KHTML_XSLT
       void applyXSLTransform(ProcessingInstructionImpl* pi);
       void setTransformSource(void* doc) { m_transformSource = doc; }
  @@ -710,6 +712,8 @@
   
       QPtrDict<NodeImpl> m_disconnectedNodesWithEventListeners;
   
  +    int m_docID; // A unique document identifier used for things like document-specific mapped attributes.
  +
   #if APPLE_CHANGES
   public:
       KWQSignal m_finishedParsing;
  
  
  



More information about the webkit-changes mailing list