| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 21 matching lines...) Expand all Loading... |
| 32 #include "bindings/core/v8/V8History.h" | 32 #include "bindings/core/v8/V8History.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/ExceptionState.h" | 34 #include "bindings/core/v8/ExceptionState.h" |
| 35 #include "bindings/core/v8/SerializedScriptValue.h" | 35 #include "bindings/core/v8/SerializedScriptValue.h" |
| 36 #include "bindings/core/v8/V8Binding.h" | 36 #include "bindings/core/v8/V8Binding.h" |
| 37 #include "bindings/core/v8/V8HiddenValue.h" | 37 #include "bindings/core/v8/V8HiddenValue.h" |
| 38 #include "bindings/core/v8/V8Window.h" | 38 #include "bindings/core/v8/V8Window.h" |
| 39 #include "core/dom/ExceptionCode.h" | 39 #include "core/dom/ExceptionCode.h" |
| 40 #include "core/frame/History.h" | 40 #include "core/frame/History.h" |
| 41 | 41 |
| 42 namespace WebCore { | 42 namespace blink { |
| 43 | 43 |
| 44 void V8History::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Va
lue>& info) | 44 void V8History::stateAttributeGetterCustom(const v8::PropertyCallbackInfo<v8::Va
lue>& info) |
| 45 { | 45 { |
| 46 History* history = V8History::toNative(info.Holder()); | 46 History* history = V8History::toNative(info.Holder()); |
| 47 | 47 |
| 48 v8::Handle<v8::Value> value = V8HiddenValue::getHiddenValue(info.GetIsolate(
), info.Holder(), V8HiddenValue::state(info.GetIsolate())); | 48 v8::Handle<v8::Value> value = V8HiddenValue::getHiddenValue(info.GetIsolate(
), info.Holder(), V8HiddenValue::state(info.GetIsolate())); |
| 49 | 49 |
| 50 if (!value.IsEmpty() && !history->stateChanged()) { | 50 if (!value.IsEmpty() && !history->stateChanged()) { |
| 51 v8SetReturnValue(info, value); | 51 v8SetReturnValue(info, value); |
| 52 return; | 52 return; |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 84 |
| 85 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in
fo[1]); | 85 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, title, in
fo[1]); |
| 86 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info
[2]); | 86 TOSTRING_VOID(V8StringResource<TreatNullAndUndefinedAsNullString>, url, info
[2]); |
| 87 | 87 |
| 88 History* history = V8History::toNative(info.Holder()); | 88 History* history = V8History::toNative(info.Holder()); |
| 89 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeR
edirectWithLockedBackForwardList, exceptionState); | 89 history->stateObjectAdded(historyState.release(), title, url, FrameLoadTypeR
edirectWithLockedBackForwardList, exceptionState); |
| 90 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV
alue::state(info.GetIsolate())); | 90 V8HiddenValue::deleteHiddenValue(info.GetIsolate(), info.Holder(), V8HiddenV
alue::state(info.GetIsolate())); |
| 91 exceptionState.throwIfNeeded(); | 91 exceptionState.throwIfNeeded(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace WebCore | 94 } // namespace blink |
| OLD | NEW |