Merge 77738

Source/WebCore/bindings/js/JSDesktopNotificationsCustom.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 29 matching lines @@
 #include "Notification.h"
 #include "NotificationCenter.h"
 #include <runtime/Error.h>
 
 using namespace JSC;
 
 namespace WebCore {
 
 JSValue JSNotificationCenter::requestPermission(ExecState* exec)
 {
-    ScriptExecutionContext* context = impl()->context();
+    ScriptExecutionContext* context = impl()->scriptExecutionContext();
 
     // Make sure that script execution context is valid.
     if (!context) {
         setDOMException(exec, INVALID_STATE_ERR);
         return jsUndefined();
     }
 
     // Permission request is only valid from page context.
     if (context->isWorkerContext())
         return throwSyntaxError(exec);
 
     if (!exec->argument(0).isObject())
         return throwTypeError(exec);
 
     PassRefPtr<JSCustomVoidCallback> callback = JSCustomVoidCallback::create(exec->argument(0).getObject(), toJSDOMGlobalObject(static_cast<Document*>(context), exec));
 
     impl()->requestPermission(callback);
     return jsUndefined();
 }
 
 } // namespace
 
 #endif // ENABLE(NOTIFICATIONS)