mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
Bug 648484, part 1: Fix some warning spam. r=roc
This commit is contained in:
parent
f439589647
commit
6033ee3875
@ -527,12 +527,14 @@ ContentParent::RecvGetClipboardText(const PRInt32& whichClipboard, nsString* tex
|
|||||||
clipboard->GetData(trans, whichClipboard);
|
clipboard->GetData(trans, whichClipboard);
|
||||||
nsCOMPtr<nsISupports> tmp;
|
nsCOMPtr<nsISupports> tmp;
|
||||||
PRUint32 len;
|
PRUint32 len;
|
||||||
rv = trans->GetTransferData(kUnicodeMime, getter_AddRefs(tmp), &len);
|
rv = trans->GetTransferData(kUnicodeMime, getter_AddRefs(tmp), &len);
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
if (NS_FAILED(rv))
|
||||||
|
return false;
|
||||||
|
|
||||||
nsCOMPtr<nsISupportsString> supportsString = do_QueryInterface(tmp);
|
nsCOMPtr<nsISupportsString> supportsString = do_QueryInterface(tmp);
|
||||||
// No support for non-text data
|
// No support for non-text data
|
||||||
NS_ENSURE_TRUE(supportsString, NS_ERROR_NOT_IMPLEMENTED);
|
if (!supportsString)
|
||||||
|
return false;
|
||||||
supportsString->GetData(*text);
|
supportsString->GetData(*text);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -38,6 +38,7 @@
|
|||||||
|
|
||||||
#include "CanvasLayerD3D10.h"
|
#include "CanvasLayerD3D10.h"
|
||||||
|
|
||||||
|
#include "../d3d9/Nv3DVUtils.h"
|
||||||
#include "gfxImageSurface.h"
|
#include "gfxImageSurface.h"
|
||||||
#include "gfxWindowsSurface.h"
|
#include "gfxWindowsSurface.h"
|
||||||
#include "gfxWindowsPlatform.h"
|
#include "gfxWindowsPlatform.h"
|
||||||
|
@ -38,6 +38,8 @@
|
|||||||
|
|
||||||
#include "ColorLayerD3D10.h"
|
#include "ColorLayerD3D10.h"
|
||||||
|
|
||||||
|
#include "../d3d9/Nv3DVUtils.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
namespace layers {
|
namespace layers {
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
#ifndef GFX_COLORLAYERD3D10_H
|
#ifndef GFX_COLORLAYERD3D10_H
|
||||||
#define GFX_COLORLAYERD3D10_H
|
#define GFX_COLORLAYERD3D10_H
|
||||||
|
|
||||||
#include "Layers.h"
|
|
||||||
#include "LayerManagerD3D10.h"
|
#include "LayerManagerD3D10.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
@ -40,6 +40,7 @@
|
|||||||
#include "gfxUtils.h"
|
#include "gfxUtils.h"
|
||||||
#include "nsRect.h"
|
#include "nsRect.h"
|
||||||
|
|
||||||
|
#include "../d3d9/Nv3DVUtils.h"
|
||||||
#include "ThebesLayerD3D10.h"
|
#include "ThebesLayerD3D10.h"
|
||||||
#include "ReadbackProcessor.h"
|
#include "ReadbackProcessor.h"
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
#ifndef GFX_CONTAINERLAYERD3D10_H
|
#ifndef GFX_CONTAINERLAYERD3D10_H
|
||||||
#define GFX_CONTAINERLAYERD3D10_H
|
#define GFX_CONTAINERLAYERD3D10_H
|
||||||
|
|
||||||
#include "Layers.h"
|
|
||||||
#include "LayerManagerD3D10.h"
|
#include "LayerManagerD3D10.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
@ -43,6 +43,7 @@
|
|||||||
#include "gfxD2DSurface.h"
|
#include "gfxD2DSurface.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#include "../d3d9/Nv3DVUtils.h"
|
||||||
#include "gfxTeeSurface.h"
|
#include "gfxTeeSurface.h"
|
||||||
#include "gfxUtils.h"
|
#include "gfxUtils.h"
|
||||||
#include "ReadbackLayer.h"
|
#include "ReadbackLayer.h"
|
||||||
@ -284,7 +285,7 @@ ThebesLayerD3D10::Validate(ReadbackProcessor *aReadback)
|
|||||||
device()->CreateTexture2D(&desc, NULL, getter_AddRefs(readbackTexture));
|
device()->CreateTexture2D(&desc, NULL, getter_AddRefs(readbackTexture));
|
||||||
device()->CopyResource(readbackTexture, mTexture);
|
device()->CopyResource(readbackTexture, mTexture);
|
||||||
|
|
||||||
for (int i = 0; i < readbackUpdates.Length(); i++) {
|
for (PRUint32 i = 0; i < readbackUpdates.Length(); i++) {
|
||||||
mD3DManager->readbackManager()->PostTask(readbackTexture,
|
mD3DManager->readbackManager()->PostTask(readbackTexture,
|
||||||
&readbackUpdates[i],
|
&readbackUpdates[i],
|
||||||
gfxPoint(newTextureRect.x, newTextureRect.y));
|
gfxPoint(newTextureRect.x, newTextureRect.y));
|
||||||
|
@ -38,7 +38,6 @@
|
|||||||
#ifndef GFX_THEBESLAYERD3D10_H
|
#ifndef GFX_THEBESLAYERD3D10_H
|
||||||
#define GFX_THEBESLAYERD3D10_H
|
#define GFX_THEBESLAYERD3D10_H
|
||||||
|
|
||||||
#include "Layers.h"
|
|
||||||
#include "LayerManagerD3D10.h"
|
#include "LayerManagerD3D10.h"
|
||||||
|
|
||||||
namespace mozilla {
|
namespace mozilla {
|
||||||
|
Loading…
Reference in New Issue
Block a user