Changeset 102794 in webkit

Timestamp:

Dec 14, 2011 10:03:32 AM (12 years ago)

Author:

kbr@google.com

Message:

Unreviewed, rolling out r102688.
​http://trac.webkit.org/changeset/102688
​https://bugs.webkit.org/show_bug.cgi?id=74220

Under the hypothesis that it might be the cause of
browser_tests and ui_tests crashes on Chromium canaries --
will reland if not.

• bindings/v8/V8Proxy.cpp:

(WebCore::addMessageToConsole):
(WebCore::logInfo):
(WebCore::V8Proxy::reportUnsafeAccessTo):

• bindings/v8/V8Proxy.h:
• bindings/v8/custom/V8CustomXPathNSResolver.cpp:

(WebCore::V8CustomXPathNSResolver::lookupNamespaceURI):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Proxy.cpp (modified) (5 diffs)
• bindings/v8/V8Proxy.h (modified) (1 diff)
• bindings/v8/custom/V8CustomXPathNSResolver.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-14  Kenneth Russell  <kbr@google.com>
+
+        Unreviewed, rolling out r102688.
+        http://trac.webkit.org/changeset/102688
+        https://bugs.webkit.org/show_bug.cgi?id=74220
+
+        Under the hypothesis that it might be the cause of
+        browser_tests and ui_tests crashes on Chromium canaries --
+        will reland if not.
+
+        * bindings/v8/V8Proxy.cpp:
+        (WebCore::addMessageToConsole):
+        (WebCore::logInfo):
+        (WebCore::V8Proxy::reportUnsafeAccessTo):
+        * bindings/v8/V8Proxy.h:
+        * bindings/v8/custom/V8CustomXPathNSResolver.cpp:
+        (WebCore::V8CustomXPathNSResolver::lookupNamespaceURI):
+
 2011-12-14  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/bindings/v8/V8Proxy.cpp

@@ -34 +34 @@
 #include "CSSMutableStyleDeclaration.h"
 #include "CachedMetadata.h"
+#include "Console.h"
 #include "DateExtension.h"
 #include "Document.h"
@@ -43 +44 @@
 #include "IDBFactoryBackendInterface.h"
 #include "InspectorInstrumentation.h"
+#include "Page.h"
 #include "PlatformSupport.h"
 #include "ScriptSourceCode.h"
@@ -118 +120 @@
 typedef HashMap<int, v8::FunctionTemplate*> FunctionTemplateMap;
 
+static void addMessageToConsole(Page* page, const String& message, const String& sourceID, unsigned lineNumber)
+{
+    ASSERT(page);
+    Console* console = page->mainFrame()->domWindow()->console();
+    console->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, message, lineNumber, sourceID);
+}
+
+void logInfo(Frame* frame, const String& message, const String& url)
+{
+    Page* page = frame->page();
+    if (!page)
+        return;
+    addMessageToConsole(page, message, url, 0);
+}
+
 void V8Proxy::reportUnsafeAccessTo(Frame* target)
 {
@@ -128 +145 @@
     if (!source)
         return;
+    Page* page = source->page();
+    if (!page)
+        return;
 
     Document* sourceDocument = source->document();
@@ -138 +158 @@
                  " 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.
-    sourceDocument->addConsoleMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, str);
+    addMessageToConsole(page, str, kSourceID, kLineNumber);
 }
 

trunk/Source/WebCore/bindings/v8/V8Proxy.h

@@ -66 +66 @@
     class WorldContextHandle;
 
+    // FIXME: use standard logging facilities in WebCore.
+    void logInfo(Frame*, const String& message, const String& url);
+
     // The following Batch structs and methods are used for setting multiple
     // properties on an ObjectTemplate, used from the generated bindings

trunk/Source/WebCore/bindings/v8/custom/V8CustomXPathNSResolver.cpp

@@ -31 +31 @@
 #include "V8CustomXPathNSResolver.h"
 
-#include "ScriptCallStack.h"
-#include "ScriptExecutionContext.h"
+#include "PlatformString.h"
 #include "V8Binding.h"
 #include "V8Proxy.h"
-#include "V8Utilities.h"
-#include <wtf/text/WTFString.h>
 
 namespace WebCore {
@@ -67 +64 @@
 
     if (lookupNamespaceURIFunc.IsEmpty() && !m_resolver->IsFunction()) {
-        if (ScriptExecutionContext* context = getScriptExecutionContext())
-            context->addMessage(JSMessageSource, LogMessageType, ErrorMessageLevel, "XPathNSResolver does not have a lookupNamespaceURI method.", 0, String(), 0);
+        if (V8Proxy* proxy = V8Proxy::retrieve()) {
+            if (Frame* frame = proxy->frame())
+                logInfo(frame, "XPathNSResolver does not have a lookupNamespaceURI method.", String());
+        }
         return String();
     }