OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 #include "core/loader/FrameLoaderClient.h" | 55 #include "core/loader/FrameLoaderClient.h" |
56 #include "core/origin_trials/OriginTrialContext.h" | 56 #include "core/origin_trials/OriginTrialContext.h" |
57 #include "platform/Histogram.h" | 57 #include "platform/Histogram.h" |
58 #include "platform/RuntimeEnabledFeatures.h" | 58 #include "platform/RuntimeEnabledFeatures.h" |
59 #include "platform/ScriptForbiddenScope.h" | 59 #include "platform/ScriptForbiddenScope.h" |
60 #include "platform/TraceEvent.h" | 60 #include "platform/TraceEvent.h" |
61 #include "platform/heap/Handle.h" | 61 #include "platform/heap/Handle.h" |
62 #include "platform/weborigin/SecurityOrigin.h" | 62 #include "platform/weborigin/SecurityOrigin.h" |
63 #include "public/platform/Platform.h" | 63 #include "public/platform/Platform.h" |
64 #include "wtf/Assertions.h" | 64 #include "wtf/Assertions.h" |
65 #include "wtf/OwnPtr.h" | |
66 #include "wtf/StringExtras.h" | 65 #include "wtf/StringExtras.h" |
67 #include "wtf/text/CString.h" | 66 #include "wtf/text/CString.h" |
68 #include <algorithm> | 67 #include <algorithm> |
69 #include <utility> | 68 #include <utility> |
70 #include <v8-debug.h> | 69 #include <v8-debug.h> |
71 #include <v8.h> | 70 #include <v8.h> |
72 | 71 |
73 namespace blink { | 72 namespace blink { |
74 | 73 |
75 static void checkDocumentWrapper(v8::Local<v8::Object> wrapper, Document* docume
nt) | 74 static void checkDocumentWrapper(v8::Local<v8::Object> wrapper, Document* docume
nt) |
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 } | 558 } |
560 | 559 |
561 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) | 560 void WindowProxy::updateSecurityOrigin(SecurityOrigin* origin) |
562 { | 561 { |
563 if (!isContextInitialized()) | 562 if (!isContextInitialized()) |
564 return; | 563 return; |
565 setSecurityToken(origin); | 564 setSecurityToken(origin); |
566 } | 565 } |
567 | 566 |
568 } // namespace blink | 567 } // namespace blink |
OLD | NEW |