diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-13 09:46:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-13 09:46:15 -0700 |
| commit | b94a30def72cdfa7401b9b0b960385e3a92afa94 (patch) | |
| tree | e2fc4fbdfdeba9a630057df7b82dbc9c36b00e20 /WebCore | |
| parent | 835eaba968882cdec3f81bd389e26fbdce005b43 (diff) | |
| parent | e99258ca6edd7c8df76ccf8842abfd7bff7c49a1 (diff) | |
| download | external_webkit-b94a30def72cdfa7401b9b0b960385e3a92afa94.zip external_webkit-b94a30def72cdfa7401b9b0b960385e3a92afa94.tar.gz external_webkit-b94a30def72cdfa7401b9b0b960385e3a92afa94.tar.bz2 | |
Merge "Fix crash in fast/frames/iframe-access-screen-of-deleted.html"
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/platform/android/ScreenAndroid.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/platform/android/ScreenAndroid.cpp b/WebCore/platform/android/ScreenAndroid.cpp index 21df08a..70cf794 100644 --- a/WebCore/platform/android/ScreenAndroid.cpp +++ b/WebCore/platform/android/ScreenAndroid.cpp @@ -68,6 +68,9 @@ bool screenIsMonochrome(Widget* page) // the accuracy of these number are not too important. FloatRect screenRect(Widget* page) { + if (!page) + return FloatRect(); + IntRect rect = page->root()->platformWidget()->getBounds(); return FloatRect(0.0, 0.0, rect.width(), rect.height()); } @@ -76,6 +79,9 @@ FloatRect screenRect(Widget* page) // to position and resize windows (usually to full screen). FloatRect screenAvailableRect(Widget* page) { + if (!page) + return FloatRect(); + IntRect rect = page->root()->platformWidget()->getBounds(); return FloatRect(0.0, 0.0, rect.width(), rect.height()); } |