Follow-up for Bug 1002354 - remove dual GetId in nsScreenGtk injected during rebase foul-up. r=bustage-fix on a CLOSED TREE.
☠☠ backed out by 161857889ed5 ☠ ☠
authorMike Conley <mconley@mozilla.com>
Mon, 14 Jul 2014 12:10:34 -0400
changeset 215746 e623938ea6c77d8939765680d9c5026b26debcf3
parent 215745 bdf72cebcd85962092b1cc6772c2d5afd839e441
child 215747 161857889ed5dc7eed3f3036ea062f061573a000
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1002354
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Follow-up for Bug 1002354 - remove dual GetId in nsScreenGtk injected during rebase foul-up. r=bustage-fix on a CLOSED TREE.
widget/gtk/nsScreenGtk.cpp
--- a/widget/gtk/nsScreenGtk.cpp
+++ b/widget/gtk/nsScreenGtk.cpp
@@ -30,23 +30,16 @@ nsScreenGtk :: ~nsScreenGtk()
 
 
 nsScreenGtk :: GetId(uint32_t *aId)
 {
   *aId = mId;
   return NS_OK;
 } // GetId
 
-NS_IMETHODIMP
-nsScreenGtk :: GetId(uint32_t *aId)
-{
-  *aId = mId;
-  return NS_OK;
-} // GetId
-
 
 NS_IMETHODIMP
 nsScreenGtk :: GetRect(int32_t *outLeft, int32_t *outTop, int32_t *outWidth, int32_t *outHeight)
 {
   *outLeft = mRect.x;
   *outTop = mRect.y;
   *outWidth = mRect.width;
   *outHeight = mRect.height;