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

Issue 1120333007: Revert of Migrate error messages, part 7. (Closed)

Created:
5 years, 7 months ago by Yang
Modified:
5 years, 7 months ago
Reviewers:
mvstanton
CC:
v8-dev
Base URL:
https://chromium.googlesource.com/v8/v8.git@master
Target Ref:
refs/pending/heads/master
Project:
v8
Visibility:
Public.

Description

Revert of Migrate error messages, part 7. (patchset #3 id:40001 of https://codereview.chromium.org/1122033002/) Reason for revert: layout test failures. Original issue's description: > Migrate error messages, part 7. > > R=mvstanton@chromium.org > > Committed: https://crrev.com/a3ddb1bc428bf74b79b77143d1abb9f8862b2f9e > Cr-Commit-Position: refs/heads/master@{#28216} TBR=mvstanton@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+50 lines, -78 lines) Patch
M src/arraybuffer.js View 1 chunk +1 line, -1 line 0 comments Download
M src/collection.js View 3 chunks +3 lines, -3 lines 0 comments Download
M src/harmony-array.js View 1 chunk +1 line, -1 line 0 comments Download
M src/harmony-regexp.js View 1 chunk +2 lines, -1 line 0 comments Download
M src/harmony-typedarray.js View 1 chunk +3 lines, -1 line 0 comments Download
M src/messages.h View 3 chunks +1 line, -19 lines 0 comments Download
M src/messages.js View 2 chunks +14 lines, -0 lines 0 comments Download
M src/object-observe.js View 7 chunks +17 lines, -16 lines 0 comments Download
M src/runtime/runtime-internal.cc View 1 chunk +1 line, -1 line 0 comments Download
M src/runtime/runtime-typedarray.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M src/typedarray.js View 1 chunk +1 line, -1 line 0 comments Download
M src/weak-collection.js View 3 chunks +3 lines, -3 lines 0 comments Download
M test/mjsunit/messages.js View 5 chunks +1 line, -29 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
Yang
Created Revert of Migrate error messages, part 7.
5 years, 7 months ago (2015-05-05 09:54:06 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1120333007/1
5 years, 7 months ago (2015-05-05 09:54:14 UTC) #2
commit-bot: I haz the power
5 years, 7 months ago (2015-05-05 09:54:25 UTC) #4
Failed to apply patch for src/object-observe.js:
While running git apply --index -3 -p1;
  error: patch failed: src/object-observe.js:371
  Falling back to three-way merge...
  Applied patch to 'src/object-observe.js' with conflicts.
  U src/object-observe.js

Patch:       src/object-observe.js
Index: src/object-observe.js
diff --git a/src/object-observe.js b/src/object-observe.js
index
a9eb1e0324f6527ff88622ade0d1ac6378d3ad2b..11562cb236fa370f38a311a203893005cb34ef41
100644
--- a/src/object-observe.js
+++ b/src/object-observe.js
@@ -315,7 +315,8 @@
   if (IS_UNDEFINED(arg))
     return arg;
 
-  if (!IS_SPEC_OBJECT(arg)) throw MakeTypeError(kObserveInvalidAccept);
+  if (!IS_SPEC_OBJECT(arg))
+    throw MakeTypeError("observe_invalid_accept");
 
   var len = ToInteger(arg.length);
   if (len < 0) len = 0;
@@ -371,13 +372,13 @@
 
 function ObjectObserve(object, callback, acceptList) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "observe", "observe");
+    throw MakeTypeError("observe_non_object", ["observe"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "observe");
+    throw MakeTypeError("observe_global_proxy", ["observe"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "observe");
+    throw MakeTypeError("observe_non_function", ["observe"]);
   if (ObjectIsFrozen(callback))
-    throw MakeTypeError(kObserveCallbackFrozen);
+    throw MakeTypeError("observe_callback_frozen");
 
   var objectObserveFn = %GetObjectContextObjectObserve(object);
   return objectObserveFn(object, callback, acceptList);
@@ -394,11 +395,11 @@
 
 function ObjectUnobserve(object, callback) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "unobserve", "unobserve");
+    throw MakeTypeError("observe_non_object", ["unobserve"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "unobserve");
+    throw MakeTypeError("observe_global_proxy", ["unobserve"]);
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "unobserve");
+    throw MakeTypeError("observe_non_function", ["unobserve"]);
 
   var objectInfo = ObjectInfoGet(object);
   if (IS_UNDEFINED(objectInfo))
@@ -557,9 +558,9 @@
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeRecord.type))
-    throw MakeTypeError(kObserveTypeNonString);
+    throw MakeTypeError("observe_type_non_string");
 
   ObjectInfoEnqueueExternalChangeRecord(objectInfo, changeRecord);
 }
@@ -571,11 +572,11 @@
 
   var objectInfo = ObjectInfoGetFromNotifier(this);
   if (IS_UNDEFINED(objectInfo))
-    throw MakeTypeError(kObserveNotifyNonNotifier);
+    throw MakeTypeError("observe_notify_non_notifier");
   if (!IS_STRING(changeType))
-    throw MakeTypeError(kObservePerformNonString);
+    throw MakeTypeError("observe_perform_non_string");
   if (!IS_SPEC_FUNCTION(changeFn))
-    throw MakeTypeError(kObservePerformNonFunction);
+    throw MakeTypeError("observe_perform_non_function");
 
   var performChangeFn = %GetObjectContextNotifierPerformChange(objectInfo);
   performChangeFn(objectInfo, changeType, changeFn);
@@ -599,9 +600,9 @@
 
 function ObjectGetNotifier(object) {
   if (!IS_SPEC_OBJECT(object))
-    throw MakeTypeError(kObserveNonObject, "getNotifier", "getNotifier");
+    throw MakeTypeError("observe_non_object", ["getNotifier"]);
   if (%IsJSGlobalProxy(object))
-    throw MakeTypeError(kObserveGlobalProxy, "getNotifier");
+    throw MakeTypeError("observe_global_proxy", ["getNotifier"]);
 
   if (ObjectIsFrozen(object)) return null;
 
@@ -643,7 +644,7 @@
 
 function ObjectDeliverChangeRecords(callback) {
   if (!IS_SPEC_FUNCTION(callback))
-    throw MakeTypeError(kObserveNonFunction, "deliverChangeRecords");
+    throw MakeTypeError("observe_non_function", ["deliverChangeRecords"]);
 
   while (CallbackDeliverPending(callback)) {}
 }

Powered by Google App Engine
This is Rietveld 408576698