Changeset 30114 in webkit


Ignore:
Timestamp:
Feb 9, 2008 2:54:10 PM (16 years ago)
Author:
hyatt@apple.com
Message:

Followup to 17203. Missed a directory.

Location:
trunk/WebCore/rendering
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/rendering/RenderApplet.cpp

    r25754 r30114  
    6060{
    6161    HTMLAppletElement* element = static_cast<HTMLAppletElement*>(node());
    62     if (m_widget)
    63         return;
    64     if (!element->allParamsAvailable())
     62    if (m_widget || !element->isFinishedParsingChildren())
    6563        return;
    6664
  • trunk/WebCore/rendering/RenderPartObject.cpp

    r28626 r30114  
    122122
    123123      o->setNeedWidgetUpdate(false);
    124       if (!o->isComplete())
     124      if (!o->isFinishedParsingChildren())
    125125        return;
    126126      // Check for a child EMBED tag.
  • trunk/WebCore/rendering/RenderStyle.cpp

    r30069 r30114  
    935935    , m_childrenAffectedByFirstChildRules(false)
    936936    , m_childrenAffectedByLastChildRules(false)
    937     , m_childrenAffectedByPositionalRules(false)
     937    , m_childrenAffectedByForwardPositionalRules(false)
     938    , m_childrenAffectedByBackwardPositionalRules(false)
    938939    , m_firstChildState(false)
    939940    , m_lastChildState(false)
     
    956957    , m_childrenAffectedByFirstChildRules(false)
    957958    , m_childrenAffectedByLastChildRules(false)
    958     , m_childrenAffectedByPositionalRules(false)
     959    , m_childrenAffectedByForwardPositionalRules(false)
     960    , m_childrenAffectedByBackwardPositionalRules(false)
    959961    , m_firstChildState(false)
    960962    , m_lastChildState(false)
     
    9991001    , m_childrenAffectedByFirstChildRules(false)
    10001002    , m_childrenAffectedByLastChildRules(false)
    1001     , m_childrenAffectedByPositionalRules(false)
     1003    , m_childrenAffectedByForwardPositionalRules(false)
     1004    , m_childrenAffectedByBackwardPositionalRules(false)
    10021005    , m_firstChildState(false)
    10031006    , m_lastChildState(false)
  • trunk/WebCore/rendering/RenderStyle.h

    r30069 r30114  
    14751475    bool m_childrenAffectedByFirstChildRules : 1;
    14761476    bool m_childrenAffectedByLastChildRules  : 1;
    1477     bool m_childrenAffectedByPositionalRules : 1;
     1477    bool m_childrenAffectedByForwardPositionalRules : 1;
     1478    bool m_childrenAffectedByBackwardPositionalRules : 1;
    14781479    bool m_firstChildState : 1;
    14791480    bool m_lastChildState : 1;
    1480     unsigned m_childIndex : 20; // Plenty of bits to cache an index.
     1481    unsigned m_childIndex : 19; // Plenty of bits to cache an index.
    14811482
    14821483    int m_ref;
     
    21302131    bool childrenAffectedByLastChildRules() const { return m_childrenAffectedByLastChildRules; }
    21312132    void setChildrenAffectedByLastChildRules() { m_childrenAffectedByLastChildRules = true; }
    2132     bool childrenAffectedByPositionalRules() const { return m_childrenAffectedByPositionalRules; }
    2133     void setChildrenAffectedByPositionalRules() { m_childrenAffectedByPositionalRules = true; }
     2133    bool childrenAffectedByForwardPositionalRules() const { return m_childrenAffectedByForwardPositionalRules; }
     2134    void setChildrenAffectedByForwardPositionalRules() { m_childrenAffectedByForwardPositionalRules = true; }
     2135    bool childrenAffectedByBackwardPositionalRules() const { return m_childrenAffectedByBackwardPositionalRules; }
     2136    void setChildrenAffectedByBackwardPositionalRules() { m_childrenAffectedByBackwardPositionalRules = true; }
    21342137    bool firstChildState() const { return m_firstChildState; }
    21352138    void setFirstChildState() { m_firstChildState = true; }
Note: See TracChangeset for help on using the changeset viewer.