| Index: third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h
|
| diff --git a/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h b/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h
|
| index 3fd00389eaa5c7c114b0cd6ef7970b64452aba8e..fece5d71420841009c4097248af9c83586345dd5 100644
|
| --- a/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h
|
| +++ b/third_party/WebKit/Source/platform/bindings/DOMWrapperWorld.h
|
| @@ -39,7 +39,6 @@
|
| #include "platform/wtf/PassRefPtr.h"
|
| #include "platform/wtf/RefCounted.h"
|
| #include "platform/wtf/RefPtr.h"
|
| -#include "public/platform/WebIsolatedWorldIds.h"
|
| #include "v8/include/v8.h"
|
|
|
| namespace blink {
|
| @@ -57,8 +56,12 @@
|
| kInvalidWorldId = -1,
|
| kMainWorldId = 0,
|
|
|
| - kEmbedderWorldIdLimit = IsolatedWorldId::kEmbedderWorldIdLimit,
|
| - kIsolatedWorldIdLimit = IsolatedWorldId::kIsolatedWorldIdLimit,
|
| + // Embedder isolated worlds can use IDs in [1, 1<<29).
|
| + kEmbedderWorldIdLimit = (1 << 29),
|
| + kDocumentXMLTreeViewerWorldId,
|
| + kDevToolsFirstIsolatedWorldId,
|
| + kDevToolsLastIsolatedWorldId = kDevToolsFirstIsolatedWorldId + 100,
|
| + kIsolatedWorldIdLimit,
|
|
|
| // Other worlds can use IDs after this. Don't manually pick up an ID from
|
| // this range. generateWorldIdForType() picks it up on behalf of you.
|
|
|