Merge mozilla-central into e10s.

This commit is contained in:
Benjamin Smedberg
2009-10-28 11:32:00 -04:00
294 changed files with 5256 additions and 3530 deletions

View File

@@ -88,7 +88,6 @@
#include "nsIJSContextStack.h"
#include "nsIScriptObjectPrincipal.h"
#include "nsDocumentCharsetInfoCID.h"
#include "nsICanvasFrame.h"
#include "nsIScrollableFrame.h"
#include "nsContentPolicyUtils.h" // NS_CheckContentLoadPolicy(...)
#include "nsICategoryManager.h"