Merge 76786 - 2011-01-27 Yury Semikhatsky <yurys@chromium.org>...

Source/WebCore/bindings/v8/V8Proxy.cpp

 /*
  * Copyright (C) 2008, 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 135 matching lines @@
 }
 
 void V8Proxy::reportUnsafeAccessTo(Frame* target)
 {
     ASSERT(target);
     Document* targetDocument = target->document();
     if (!targetDocument)
         return;
 
     Frame* source = V8Proxy::retrieveFrameForEnteredContext();
-    if (!source || !source->document())
-        return; // Ignore error if the source document is gone.
+    if (!source)
+        return;
+    Page* page = source->page();
+    if (!page)
+        return;
 
     Document* sourceDocument = source->document();
+    if (!sourceDocument)
+        return; // Ignore error if the source document is gone.
 
     // FIXME: This error message should contain more specifics of why the same
     // origin check has failed.
     String str = makeString("Unsafe JavaScript attempt to access frame with URL ", targetDocument->url().string(),
                             " from frame with URL ", sourceDocument->url().string(), ". Domains, protocols and ports must match.\n");
 
     // Build a console message with fake source ID and line number.
     const String kSourceID = "";
     const int kLineNumber = 1;
 
     // NOTE: Safari prints the message in the target page, but it seems like
     // it should be in the source page. Even for delayed messages, we put it in
     // the source page.
-    addMessageToConsole(source->page(), str, kSourceID, kLineNumber);
+    addMessageToConsole(page, str, kSourceID, kLineNumber);
 }
 
 static void handleFatalErrorInV8()
 {
     // FIXME: We temporarily deal with V8 internal error situations
     // such as out-of-memory by crashing the renderer.
     CRASH();
 }
 
 V8Proxy::V8Proxy(Frame* frame)
@@ skipping 637 matching lines @@
 #if ENABLE(WORKERS)
     } else if (context->isWorkerContext()) {
         if (WorkerContextExecutionProxy* proxy = static_cast<WorkerContext*>(context)->script()->proxy())
             return proxy->context();
 #endif
     }
     return v8::Local<v8::Context>();
 }
 
 }  // namespace WebCore