| Index: third_party/WebKit/WebCore/dom/ExceptionContext.cpp
|
| ===================================================================
|
| --- third_party/WebKit/WebCore/dom/ExceptionContext.cpp (revision 4268)
|
| +++ third_party/WebKit/WebCore/dom/ExceptionContext.cpp (working copy)
|
| @@ -36,23 +36,13 @@
|
| namespace WebCore {
|
|
|
| ExceptionContext::ExceptionContext(Node* node)
|
| - : m_exec(execStateFromNode(node))
|
| + : m_data(execStateFromNode(node))
|
| {
|
| }
|
|
|
| bool ExceptionContext::hadException()
|
| {
|
| - return m_exec->hadException();
|
| + return m_data->hadException();
|
| }
|
|
|
| -JSException ExceptionContext::noException()
|
| -{
|
| - return 0;
|
| -}
|
| -
|
| -JSException ExceptionContext::exception() const
|
| -{
|
| - return m_exec->exception();
|
| -}
|
| -
|
| } // namespace WebCore
|
|
|
| Property changes on: third_party\WebKit\WebCore\dom\ExceptionContext.cpp
|
| ___________________________________________________________________
|
| Added: svn:mergeinfo
|
| Merged /branches/chrome_webkit_merge_branch/deps/third_party/WebKit/WebCore/bindings/js/ExceptionContext.cpp:r3734-4214
|
|
|
|
|