diff options
| author | John Reck <jreck@google.com> | 2012-04-17 15:38:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-17 15:38:55 -0700 |
| commit | a43fd078576f0e7e5a7eb3364ae69ca46e3fecc8 (patch) | |
| tree | 0c3eb40ffade67a564c8b9277bfd01e147b53301 /Source | |
| parent | e4ce40887ff759a284a56ad53d8b3cb4d0ee4bf3 (diff) | |
| parent | 4f8aa4f0ecca0a22c3907ae810301b48b3370f95 (diff) | |
| download | external_webkit-a43fd078576f0e7e5a7eb3364ae69ca46e3fecc8.zip external_webkit-a43fd078576f0e7e5a7eb3364ae69ca46e3fecc8.tar.gz external_webkit-a43fd078576f0e7e5a7eb3364ae69ca46e3fecc8.tar.bz2 | |
Merge "Fix crash in createWindow"
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp index c10f5b3..907dc3c 100644 --- a/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp +++ b/Source/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp @@ -188,10 +188,10 @@ Page* ChromeClientAndroid::createWindow(Frame* frame, const FrameLoadRequest&, return frame->page(); #endif - const WebCoreViewBridge* bridge = frame->view()->platformWidget(); + FloatRect window = windowRect(); bool dialog = features.dialog || !features.resizable - || (features.heightSet && features.height < bridge->height() - && features.widthSet && features.width < bridge->width()) + || (features.heightSet && features.height < window.height() + && features.widthSet && features.width < window.width()) || (!features.menuBarVisible && !features.statusBarVisible && !features.toolBarVisible && !features.locationBarVisible && !features.scrollbarsVisible); |