← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kde4libs/jaunty

« back to all changes in this revision

Viewing changes to khtml/rendering/render_container.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning, Jonathan Thomas, Andreas Wenning
  • Date: 2009-04-01 05:55:52 UTC
  • mfrom: (1.1.29 upstream)
  • Revision ID: james.westby@ubuntu.com-20090401055552-uel5di5f3xiftax3
Tags: 4:4.2.2-0ubuntu1
https://launchpad.net/bugs/344709
https://launchpad.net/bugs/348823
[ Jonathan Thomas ]
* New upstream release (LP: #344709, #348823):
  - Bump upstreamversion and runtimedeps in debian/rules
  - Remove kubuntu_65_kcmdlineargs_decoding_svn934640.diff, applied upstream

[ Andreas Wenning ]
* Remove patch kubuntu_69_do_not_show_plasma_popups_over_screensaver.diff,
  applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
khtml/rendering/render_container.cpp
249
249
    }
250
250
}
251
251
 
 
252
static bool inUpdatePseudoChildren = false;
 
253
 
252
254
void RenderContainer::updatePseudoChildren()
253
255
{
 
256
    if (inUpdatePseudoChildren)
 
257
        return;
 
258
    inUpdatePseudoChildren = true;
 
259
 
254
260
    // In CSS2, before/after pseudo-content cannot nest.  Check this first.
255
261
    // Remove when CSS 3 Generated Content becomes Candidate Recommendation
256
262
    if (style()->styleType() == RenderStyle::BEFORE
260
266
    updatePseudoChild(RenderStyle::BEFORE);
261
267
    updatePseudoChild(RenderStyle::AFTER);
262
268
    // updatePseudoChild(RenderStyle::MARKER, marker());
 
269
 
 
270
    inUpdatePseudoChildren = false;
263
271
}
264
272
 
265
273
void RenderContainer::updatePseudoChild(RenderStyle::PseudoId type)