Merge 125737

Source/WebCore/rendering/RenderRegion.h

 /*
  * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above
  *    copyright notice, this list of conditions and the following
  *    disclaimer.
@@ skipping 82 matching lines @@
 
     RegionState regionState() const { return isValid() ? m_regionState : RegionUndefined; }
     void setRegionState(RegionState regionState) { m_regionState = regionState; }
     
     virtual LayoutUnit logicalWidthForFlowThreadContent() const;
     virtual LayoutUnit logicalHeightForFlowThreadContent() const;
 
 private:
     virtual const char* renderName() const { return "RenderRegion"; }
 
+    virtual void insertedIntoTree() OVERRIDE;
+
     PassRefPtr<RenderStyle> computeStyleInRegion(const RenderObject*);
     void computeChildrenStyleInRegion(const RenderObject*);
     void setRegionObjectsRegionStyle();
     void restoreRegionObjectsOriginalStyle();
     void setObjectStyleInRegion(RenderObject*, PassRefPtr<RenderStyle>, bool objectRegionStyleCached);
     void printRegionObjectsStyles();
     RenderFlowThread* m_flowThread;
 
     // If this RenderRegion is displayed as part of another named flow,
     // we need to create a dependency tree, so that layout of the
@@ skipping 37 matching lines @@
     ASSERT(!object || object->isRenderRegion());
     return static_cast<const RenderRegion*>(object);
 }
 
 // This will catch anyone doing an unnecessary cast.
 void toRenderRegion(const RenderRegion*);
 
 } // namespace WebCore
 
 #endif // RenderRegion_h