Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Side by Side Diff: Source/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp

Issue 12560005: Merge 139854 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 bool isSameState = history->isSameAsCurrentState(event->serializedState()); 72 bool isSameState = history->isSameAsCurrentState(event->serializedState());
73 73
74 if (isSameState) { 74 if (isSameState) {
75 v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.Get Isolate()).As<v8::Object>(); 75 v8::Handle<v8::Object> v8History = toV8(history, info.Holder(), info.Get Isolate()).As<v8::Object>();
76 if (!history->stateChanged()) { 76 if (!history->stateChanged()) {
77 result = v8History->GetHiddenValue(V8HiddenPropertyName::state()); 77 result = v8History->GetHiddenValue(V8HiddenPropertyName::state());
78 if (!result.IsEmpty()) 78 if (!result.IsEmpty())
79 return cacheState(info.Holder(), result); 79 return cacheState(info.Holder(), result);
80 } 80 }
81 result = event->serializedState()->deserialize(0, info.GetIsolate()); 81 result = event->serializedState()->deserialize(info.GetIsolate());
82 v8History->SetHiddenValue(V8HiddenPropertyName::state(), result); 82 v8History->SetHiddenValue(V8HiddenPropertyName::state(), result);
83 } else 83 } else
84 result = event->serializedState()->deserialize(0, info.GetIsolate()); 84 result = event->serializedState()->deserialize(info.GetIsolate());
85 85
86 return cacheState(info.Holder(), result); 86 return cacheState(info.Holder(), result);
87 } 87 }
88 88
89 } // namespace WebCore 89 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/bindings/v8/custom/V8MessageEventCustom.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698