diff options
| author | Steve Block <steveblock@google.com> | 2009-10-21 14:12:09 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-22 16:36:53 +0100 |
| commit | bc7b84de3fd863c500a8169fd00dca3811cadbb3 (patch) | |
| tree | 1d3d4b6c3c86a7e5d24ab942837279ee38a292e4 /WebCore/rendering/RenderFrame.cpp | |
| parent | 1609212f285a36758049a60789693cc6f721fbc8 (diff) | |
| download | external_webkit-bc7b84de3fd863c500a8169fd00dca3811cadbb3.zip external_webkit-bc7b84de3fd863c500a8169fd00dca3811cadbb3.tar.gz external_webkit-bc7b84de3fd863c500a8169fd00dca3811cadbb3.tar.bz2 | |
Makes a number of changes to ease future merging with and upstreaming to webkit.org.
- Fixes whitespace discrepancies between webkit.org and Android versions
- Re-orders Android-specific changes to minimise the diff with webkit.org
- Makes sure all Android-specific changes are appropriately guarded.
- Fixes some Android-specific style problems
None of these should introduce any functional changes for PLATFORM(ANDROID).
Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
Diffstat (limited to 'WebCore/rendering/RenderFrame.cpp')
| -rw-r--r-- | WebCore/rendering/RenderFrame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderFrame.cpp b/WebCore/rendering/RenderFrame.cpp index 54a73c7..482d10d 100644 --- a/WebCore/rendering/RenderFrame.cpp +++ b/WebCore/rendering/RenderFrame.cpp @@ -70,7 +70,7 @@ void RenderFrame::layout() if (widget() && widget()->isFrameView()) { FrameView* view = static_cast<FrameView*>(widget()); RenderView* root = NULL; - if (view->frame() && view->frame()->document() && + if (view->frame() && view->frame()->document() && view->frame()->document()->renderer() && view->frame()->document()->renderer()->isRenderView()) root = static_cast<RenderView*>(view->frame()->document()->renderer()); |