diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/gtk/webkit/webkitwebwindowfeatures.cpp | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/gtk/webkit/webkitwebwindowfeatures.cpp')
| -rw-r--r-- | WebKit/gtk/webkit/webkitwebwindowfeatures.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp b/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp index cdb6858..a6fe1df 100644 --- a/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp +++ b/WebKit/gtk/webkit/webkitwebwindowfeatures.cpp @@ -422,19 +422,24 @@ WebKitWebWindowFeatures* webkit_web_window_features_new_from_core_features(const */ gboolean webkit_web_window_features_equal(WebKitWebWindowFeatures* features1, WebKitWebWindowFeatures* features2) { + if (features1 == features2) + return TRUE; + if (!features1 || !features2) + return FALSE; + WebKitWebWindowFeaturesPrivate* priv1 = features1->priv; WebKitWebWindowFeaturesPrivate* priv2 = features2->priv; - if((priv1->x == priv2->x) && - (priv1->y == priv2->y) && - (priv1->width == priv2->width) && - (priv1->height == priv2->height) && - (priv1->toolbar_visible == priv2->toolbar_visible) && - (priv1->statusbar_visible == priv2->statusbar_visible) && - (priv1->scrollbar_visible == priv2->scrollbar_visible) && - (priv1->menubar_visible == priv2->menubar_visible) && - (priv1->locationbar_visible == priv2->locationbar_visible) && - (priv1->fullscreen == priv2->fullscreen)) + if ((priv1->x == priv2->x) + && (priv1->y == priv2->y) + && (priv1->width == priv2->width) + && (priv1->height == priv2->height) + && (priv1->toolbar_visible == priv2->toolbar_visible) + && (priv1->statusbar_visible == priv2->statusbar_visible) + && (priv1->scrollbar_visible == priv2->scrollbar_visible) + && (priv1->menubar_visible == priv2->menubar_visible) + && (priv1->locationbar_visible == priv2->locationbar_visible) + && (priv1->fullscreen == priv2->fullscreen)) return TRUE; return FALSE; } |