diff options
| author | Steve Block <steveblock@google.com> | 2010-09-13 06:53:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 06:53:45 -0700 |
| commit | d7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9 (patch) | |
| tree | 87252de132d48caf218879bf1c55a093b19e29e0 /WebCore/rendering/RenderObject.h | |
| parent | 574b2420d2e43cab716a4ae8b5c18ff48dd7ee9f (diff) | |
| parent | e3a33d1e0c60357ad9f36df6e16799ddb5942917 (diff) | |
| download | external_webkit-d7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9.zip external_webkit-d7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9.tar.gz external_webkit-d7ab5ccadf9c3e6b43e39d9e80c7f155da1ac8d9.tar.bz2 | |
am e3a33d1e: Cherry-pick security fix in WebKit change 63048. Do not merge
Merge commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917' into gingerbread-plus-aosp
* commit 'e3a33d1e0c60357ad9f36df6e16799ddb5942917':
Cherry-pick security fix in WebKit change 63048. Do not merge
Diffstat (limited to 'WebCore/rendering/RenderObject.h')
| -rw-r--r-- | WebCore/rendering/RenderObject.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h index 6764818..fe839ff 100644 --- a/WebCore/rendering/RenderObject.h +++ b/WebCore/rendering/RenderObject.h @@ -192,7 +192,8 @@ public: // Convenience function for getting to the nearest enclosing box of a RenderObject. RenderBox* enclosingBox() const; - + RenderBoxModelObject* enclosingBoxModelObject() const; + virtual bool isEmpty() const { return firstChild() == 0; } #ifndef NDEBUG |