From 996effeff6d3e974d5c766dfde1d378d2b8d83d1 Mon Sep 17 00:00:00 2001 From: "cbiesinger%web.de" Date: Sat, 13 Aug 2005 12:00:34 +0000 Subject: [PATCH] bug 97580 back out the original patch for this bug, since it's not necessary anymore and breaks plugins patch by chpe@gnome.org r=blizzard sr=roc a=cbeard git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@177693 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp | 7 ------- mozilla/embedding/browser/gtk/src/EmbedPrivate.h | 1 - mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp | 8 +------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp index 1ed4c1c793d..f2ad745f626 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -336,13 +336,6 @@ EmbedPrivate::Resize(PRUint32 aWidth, PRUint32 aHeight) 0, 0, aWidth, aHeight); } -void -EmbedPrivate::GetSize(PRInt32 *aWidth, PRInt32 *aHeight) -{ - mWindow->GetDimensions(nsIEmbeddingSiteWindow::DIM_FLAGS_SIZE_INNER, - nsnull, nsnull, aWidth, aHeight); -} - void EmbedPrivate::Destroy(void) { diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h index 0d4a812d075..7b21fd322f6 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.h +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.h @@ -78,7 +78,6 @@ class EmbedPrivate { void Show (void); void Hide (void); void Resize (PRUint32 aWidth, PRUint32 aHeight); - void GetSize (PRInt32 *aWidth, PRInt32 *aHeight); void Destroy (void); void SetURI (const char *aURI); void LoadCurrentURI (void); diff --git a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp index 684f5aba52e..65742808c53 100644 --- a/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp +++ b/mozilla/embedding/browser/gtk/src/gtkmozembed2.cpp @@ -708,16 +708,10 @@ gtk_moz_embed_size_allocate(GtkWidget *widget, GtkAllocation *allocation) if (GTK_WIDGET_REALIZED(widget)) { - PRInt32 width, height; - - embedPrivate->GetSize (&width, &height); - gdk_window_move_resize(widget->window, allocation->x, allocation->y, allocation->width, allocation->height); - - if ((allocation->width != width) || (allocation->height != height)) - embedPrivate->Resize(allocation->width, allocation->height); + embedPrivate->Resize(allocation->width, allocation->height); } }