Modified: branches/safari-600.5-branch/LayoutTests/ChangeLog (179661 => 179662)
--- branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-05 03:36:21 UTC (rev 179661)
+++ branches/safari-600.5-branch/LayoutTests/ChangeLog 2015-02-05 03:40:46 UTC (rev 179662)
@@ -1,5 +1,19 @@
2015-02-04 Matthew Hanson <[email protected]>
+ Merge r178875. rdar://problem/19617631
+
+ 2015-01-21 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: ASSERT expanding objects in console PrimitiveBindingTraits<T>::assertValueHasExpectedType
+ https://bugs.webkit.org/show_bug.cgi?id=140746
+
+ Reviewed by Timothy Hatcher.
+
+ * TestExpectations:
+ Unskip the test now that is doesn't ASSERT in debug builds.
+
+2015-02-04 Matthew Hanson <[email protected]>
+
Merge r178490. rdar://problem/19687156
2015-01-14 Simon Fraser <[email protected]>
Modified: branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog (179661 => 179662)
--- branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog 2015-02-05 03:36:21 UTC (rev 179661)
+++ branches/safari-600.5-branch/Source/_javascript_Core/ChangeLog 2015-02-05 03:40:46 UTC (rev 179662)
@@ -1,3 +1,18 @@
+2015-02-04 Matthew Hanson <[email protected]>
+
+ Merge r178875. rdar://problem/19617631
+
+ 2015-01-21 Joseph Pecoraro <[email protected]>
+
+ Web Inspector: ASSERT expanding objects in console PrimitiveBindingTraits<T>::assertValueHasExpectedType
+ https://bugs.webkit.org/show_bug.cgi?id=140746
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/InjectedScriptSource.js:
+ Do not add impure properties to the descriptor object that will
+ eventually be sent to the frontend.
+
2015-01-20 Babak Shafiei <[email protected]>
Merge r171691.
Modified: branches/safari-600.5-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js (179661 => 179662)
--- branches/safari-600.5-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-02-05 03:36:21 UTC (rev 179661)
+++ branches/safari-600.5-branch/Source/_javascript_Core/inspector/InjectedScriptSource.js 2015-02-05 03:40:46 UTC (rev 179662)
@@ -626,7 +626,7 @@
function createFakeValueDescriptor(name, descriptor, isOwnProperty)
{
try {
- return {name: name, value: object[name], writable: descriptor.writable, configurable: descriptor.configurable, enumerable: descriptor.enumerable};
+ return {name: name, value: object[name], writable: descriptor.writable || false, configurable: descriptor.configurable || false, enumerable: descriptor.enumerable || false};
} catch (e) {
var errorDescriptor = {name: name, value: e, wasThrown: true};
if (isOwnProperty)
@@ -635,7 +635,7 @@
}
}
- function processDescriptor(descriptor, isOwnProperty)
+ function processDescriptor(descriptor, isOwnProperty, possibleNativeBindingGetter)
{
// Own properties only.
if (ownProperties) {
@@ -652,7 +652,7 @@
} else if (descriptor.hasOwnProperty("get") && descriptor.get) {
// Getter property in the prototype chain. Create a fake value descriptor.
descriptors.push(createFakeValueDescriptor(descriptor.name, descriptor, isOwnProperty));
- } else if (descriptor.possibleNativeBindingGetter) {
+ } else if (possibleNativeBindingGetter) {
// Possible getter property in the prototype chain.
descriptors.push(descriptor);
}
@@ -686,8 +686,7 @@
// Developers may create such a descriptors, so we should be resilient:
// var x = {}; Object.defineProperty(x, "p", {get:undefined}); Object.getOwnPropertyDescriptor(x, "p")
var fakeDescriptor = createFakeValueDescriptor(name, descriptor, isOwnProperty);
- fakeDescriptor.possibleNativeBindingGetter = true; // Native bindings.
- processDescriptor(fakeDescriptor, isOwnProperty);
+ processDescriptor(fakeDescriptor, isOwnProperty, true);
continue;
}
