Title: [148344] branches/safari-536.30-branch/Source/WebCore
- Revision
- 148344
- Author
- [email protected]
- Date
- 2013-04-12 21:18:32 -0700 (Fri, 12 Apr 2013)
Log Message
Merged r141315. <rdar://problem/13334946>
Modified Paths
Diff
Modified: branches/safari-536.30-branch/Source/WebCore/ChangeLog (148343 => 148344)
--- branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-13 04:15:15 UTC (rev 148343)
+++ branches/safari-536.30-branch/Source/WebCore/ChangeLog 2013-04-13 04:18:32 UTC (rev 148344)
@@ -1,5 +1,29 @@
2013-04-12 Ryosuke Niwa <[email protected]>
+ Merge 141315
+
+ 2013-01-30 Kentaro Hara <[email protected]>
+
+ isSameAsCurrentState() should take SerializedScriptValue* instead of PassRefPtr
+ https://bugs.webkit.org/show_bug.cgi?id=107904
+
+ Reviewed by Darin Adler.
+
+ Applied Darin's comment: https://bugs.webkit.org/show_bug.cgi?id=107904#c5
+
+ No tests. No change in behavior.
+
+ * bindings/js/JSPopStateEventCustom.cpp:
+ (WebCore::JSPopStateEvent::state):
+ * bindings/v8/custom/V8PopStateEventCustom.cpp:
+ (WebCore::V8PopStateEvent::stateAccessorGetter):
+ * page/History.cpp:
+ (WebCore::History::isSameAsCurrentState):
+ * page/History.h:
+ (History):
+
+2013-04-12 Ryosuke Niwa <[email protected]>
+
Merge 140886
2013-01-25 Kentaro Hara <[email protected]>
Modified: branches/safari-536.30-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp (148343 => 148344)
--- branches/safari-536.30-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2013-04-13 04:15:15 UTC (rev 148343)
+++ branches/safari-536.30-branch/Source/WebCore/bindings/js/JSPopStateEventCustom.cpp 2013-04-13 04:18:32 UTC (rev 148344)
@@ -66,7 +66,7 @@
// The current history state object might've changed in the meantime, so we need to take care
// of using the correct one, and always share the same deserialization with history.state.
- bool isSameState = history->isSameAsCurrentState(event->serializedState());
+ bool isSameState = history->isSameAsCurrentState(event->serializedState().get());
JSValue result;
if (isSameState) {
Modified: branches/safari-536.30-branch/Source/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp (148343 => 148344)
--- branches/safari-536.30-branch/Source/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp 2013-04-13 04:15:15 UTC (rev 148343)
+++ branches/safari-536.30-branch/Source/WebCore/bindings/v8/custom/V8PopStateEventCustom.cpp 2013-04-13 04:18:32 UTC (rev 148344)
@@ -70,7 +70,7 @@
// The current history state object might've changed in the meantime, so we need to take care
// of using the correct one, and always share the same deserialization with history.state.
- bool isSameState = history->isSameAsCurrentState(event->serializedState());
+ bool isSameState = history->isSameAsCurrentState(event->serializedState().get());
if (isSameState) {
v8::Handle<v8::Object> v8History = toV8(history, info.GetIsolate()).As<v8::Object>();
Modified: branches/safari-536.30-branch/Source/WebCore/page/History.cpp (148343 => 148344)
--- branches/safari-536.30-branch/Source/WebCore/page/History.cpp 2013-04-13 04:15:15 UTC (rev 148343)
+++ branches/safari-536.30-branch/Source/WebCore/page/History.cpp 2013-04-13 04:18:32 UTC (rev 148344)
@@ -77,9 +77,9 @@
return m_lastStateObjectRequested != stateInternal();
}
-bool History::isSameAsCurrentState(PassRefPtr<SerializedScriptValue> state) const
+bool History::isSameAsCurrentState(SerializedScriptValue* state) const
{
- return state == stateInternal();
+ return state == stateInternal().get();
}
void History::back()
Modified: branches/safari-536.30-branch/Source/WebCore/page/History.h (148343 => 148344)
--- branches/safari-536.30-branch/Source/WebCore/page/History.h 2013-04-13 04:15:15 UTC (rev 148343)
+++ branches/safari-536.30-branch/Source/WebCore/page/History.h 2013-04-13 04:18:32 UTC (rev 148344)
@@ -55,7 +55,7 @@
void go(ScriptExecutionContext*, int distance);
bool stateChanged() const;
- bool isSameAsCurrentState(PassRefPtr<SerializedScriptValue>) const;
+ bool isSameAsCurrentState(SerializedScriptValue*) const;
enum StateObjectType {
StateObjectPush,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
