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

Side by Side Diff: WebCore/bindings/v8/V8Proxy.cpp

Issue 5722007: Merge 73605 - 2010-12-07 Jeremy Orlow <jorlow@chromium.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/
Patch Set: Created 10 years 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 | « WebCore/bindings/js/JSDOMBinding.cpp ('k') | WebCore/dom/ExceptionCode.h » ('j') | 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) 2008, 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2008, 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 19 matching lines...) Expand all
30 30
31 #include "config.h" 31 #include "config.h"
32 #include "V8Proxy.h" 32 #include "V8Proxy.h"
33 33
34 #include "CSSMutableStyleDeclaration.h" 34 #include "CSSMutableStyleDeclaration.h"
35 #include "CachedMetadata.h" 35 #include "CachedMetadata.h"
36 #include "DateExtension.h" 36 #include "DateExtension.h"
37 #include "DocumentLoader.h" 37 #include "DocumentLoader.h"
38 #include "Frame.h" 38 #include "Frame.h"
39 #include "FrameLoaderClient.h" 39 #include "FrameLoaderClient.h"
40 #include "IDBDatabaseException.h"
40 #include "IDBFactoryBackendInterface.h" 41 #include "IDBFactoryBackendInterface.h"
41 #include "IDBPendingTransactionMonitor.h" 42 #include "IDBPendingTransactionMonitor.h"
42 #include "InspectorInstrumentation.h" 43 #include "InspectorInstrumentation.h"
43 #include "Page.h" 44 #include "Page.h"
44 #include "PageGroup.h" 45 #include "PageGroup.h"
45 #include "PlatformBridge.h" 46 #include "PlatformBridge.h"
46 #include "ScriptController.h" 47 #include "ScriptController.h"
47 #include "Settings.h" 48 #include "Settings.h"
48 #include "StorageNamespace.h" 49 #include "StorageNamespace.h"
49 #include "V8Binding.h" 50 #include "V8Binding.h"
50 #include "V8BindingState.h" 51 #include "V8BindingState.h"
51 #include "V8Collection.h" 52 #include "V8Collection.h"
52 #include "V8ConsoleMessage.h" 53 #include "V8ConsoleMessage.h"
53 #include "V8DOMCoreException.h" 54 #include "V8DOMCoreException.h"
54 #include "V8DOMMap.h" 55 #include "V8DOMMap.h"
55 #include "V8DOMWindow.h" 56 #include "V8DOMWindow.h"
56 #include "V8EventException.h" 57 #include "V8EventException.h"
57 #include "V8FileException.h" 58 #include "V8FileException.h"
58 #include "V8HiddenPropertyName.h" 59 #include "V8HiddenPropertyName.h"
59 #include "V8IsolatedContext.h" 60 #include "V8IsolatedContext.h"
60 #include "V8RangeException.h" 61 #include "V8RangeException.h"
61 #include "V8SQLException.h" 62 #include "V8SQLException.h"
62 #include "V8XMLHttpRequestException.h" 63 #include "V8XMLHttpRequestException.h"
63 #include "V8XPathException.h" 64 #include "V8XPathException.h"
64 #include "WorkerContext.h" 65 #include "WorkerContext.h"
65 #include "WorkerContextExecutionProxy.h" 66 #include "WorkerContextExecutionProxy.h"
66 67
68 #if ENABLE(INDEXED_DATABASE)
69 #include "V8IDBDatabaseException.h"
70 #endif
71
67 #if ENABLE(SVG) 72 #if ENABLE(SVG)
68 #include "V8SVGException.h" 73 #include "V8SVGException.h"
69 #endif 74 #endif
70 75
71 #include <algorithm> 76 #include <algorithm>
72 #include <stdio.h> 77 #include <stdio.h>
73 #include <utility> 78 #include <utility>
74 #include <wtf/Assertions.h> 79 #include <wtf/Assertions.h>
75 #include <wtf/OwnArrayPtr.h> 80 #include <wtf/OwnArrayPtr.h>
76 #include <wtf/OwnPtr.h> 81 #include <wtf/OwnPtr.h>
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 #if ENABLE(DATABASE) 671 #if ENABLE(DATABASE)
667 case SQLExceptionType: 672 case SQLExceptionType:
668 exception = toV8(SQLException::create(description)); 673 exception = toV8(SQLException::create(description));
669 break; 674 break;
670 #endif 675 #endif
671 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM) 676 #if ENABLE(BLOB) || ENABLE(FILE_SYSTEM)
672 case FileExceptionType: 677 case FileExceptionType:
673 exception = toV8(FileException::create(description)); 678 exception = toV8(FileException::create(description));
674 break; 679 break;
675 #endif 680 #endif
681 #if ENABLE(INDEXED_DATABASE)
682 case IDBDatabaseExceptionType:
683 exception = toV8(IDBDatabaseException::create(description));
684 break;
685 #endif
676 default: 686 default:
677 ASSERT_NOT_REACHED(); 687 ASSERT_NOT_REACHED();
678 } 688 }
679 689
680 if (!exception.IsEmpty()) 690 if (!exception.IsEmpty())
681 v8::ThrowException(exception); 691 v8::ThrowException(exception);
682 } 692 }
683 693
684 v8::Handle<v8::Value> V8Proxy::throwError(ErrorType type, const char* message) 694 v8::Handle<v8::Value> V8Proxy::throwError(ErrorType type, const char* message)
685 { 695 {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
831 #if ENABLE(WORKERS) 841 #if ENABLE(WORKERS)
832 } else if (context->isWorkerContext()) { 842 } else if (context->isWorkerContext()) {
833 if (WorkerContextExecutionProxy* proxy = static_cast<WorkerContext*>(con text)->script()->proxy()) 843 if (WorkerContextExecutionProxy* proxy = static_cast<WorkerContext*>(con text)->script()->proxy())
834 return proxy->context(); 844 return proxy->context();
835 #endif 845 #endif
836 } 846 }
837 return v8::Local<v8::Context>(); 847 return v8::Local<v8::Context>();
838 } 848 }
839 849
840 } // namespace WebCore 850 } // namespace WebCore
OLDNEW
« no previous file with comments | « WebCore/bindings/js/JSDOMBinding.cpp ('k') | WebCore/dom/ExceptionCode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698