summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--chrome/common/ipc_message_macros.h23
-rw-r--r--chrome/common/ipc_message_utils.h38
-rw-r--r--chrome/common/worker_messages_internal.h3
-rw-r--r--chrome/worker/webworkerclient_proxy.cc4
-rw-r--r--chrome/worker/webworkerclient_proxy.h1
-rw-r--r--webkit/api/public/WebWorkerClient.h7
-rw-r--r--webkit/glue/chrome_client_impl.cc1
-rw-r--r--webkit/glue/chrome_client_impl.h1
-rw-r--r--webkit/glue/webframe_impl.cc5
-rw-r--r--webkit/glue/webworker_impl.cc4
-rw-r--r--webkit/glue/webworker_impl.h2
-rw-r--r--webkit/glue/webworkerclient_impl.cc6
-rw-r--r--webkit/glue/webworkerclient_impl.h2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt33
-rw-r--r--webkit/tools/test_shell/test_worker/test_webworker.cc5
-rw-r--r--webkit/tools/test_shell/test_worker/test_webworker.h1
-rw-r--r--webkit/webkit.gyp4
18 files changed, 129 insertions, 13 deletions
diff --git a/DEPS b/DEPS
index 7ea8669..94016bd 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "45738",
+ "webkit_revision": "45840",
}
diff --git a/chrome/common/ipc_message_macros.h b/chrome/common/ipc_message_macros.h
index 11e5258..4839ecd 100644
--- a/chrome/common/ipc_message_macros.h
+++ b/chrome/common/ipc_message_macros.h
@@ -96,6 +96,7 @@
#undef IPC_MESSAGE_ROUTED4
#undef IPC_MESSAGE_ROUTED5
#undef IPC_MESSAGE_ROUTED6
+#undef IPC_MESSAGE_ROUTED7
#undef IPC_SYNC_MESSAGE_CONTROL0_0
#undef IPC_SYNC_MESSAGE_CONTROL0_1
#undef IPC_SYNC_MESSAGE_CONTROL0_2
@@ -192,6 +193,9 @@
#define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
msg_class##__ID,
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
+ msg_class##__ID,
+
#define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
msg_class##__ID,
@@ -465,6 +469,9 @@ LogFunction g_log_function_mapping[LastMsgIndex];
#define IPC_MESSAGE_ROUTED6(msg_class, type1, type2, type3, type4, type5, type6) \
IPC_MESSAGE_LOG(msg_class)
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, type6, type7) \
+ IPC_MESSAGE_LOG(msg_class)
+
#define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
IPC_MESSAGE_LOG(msg_class)
@@ -728,6 +735,22 @@ LogFunction g_log_function_mapping[LastMsgIndex];
routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5, arg6)) {} \
};
+#define IPC_MESSAGE_ROUTED7(msg_class, type1, type2, type3, type4, type5, \
+ type6, type7) \
+ class msg_class : \
+ public IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
+ type6, type7> > { \
+ public: \
+ enum { ID = msg_class##__ID }; \
+ msg_class(int32 routing_id, const type1& arg1, const type2& arg2, \
+ const type3& arg3, const type4& arg4, const type5& arg5, \
+ const type6& arg6, const type7& arg7) \
+ : IPC::MessageWithTuple< Tuple7<type1, type2, type3, type4, type5, \
+ type6, type7> >( \
+ routing_id, ID, MakeRefTuple(arg1, arg2, arg3, arg4, arg5, \
+ arg6, arg7)) {} \
+ };
+
#define IPC_SYNC_MESSAGE_CONTROL0_0(msg_class) \
class msg_class : public IPC::MessageWithReply<Tuple0, Tuple0 > { \
public: \
diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h
index 20f8706..516a432d 100644
--- a/chrome/common/ipc_message_utils.h
+++ b/chrome/common/ipc_message_utils.h
@@ -1173,6 +1173,44 @@ struct ParamTraits< Tuple6<A, B, C, D, E, F> > {
}
};
+template <class A, class B, class C, class D, class E, class F, class G>
+struct ParamTraits< Tuple7<A, B, C, D, E, F, G> > {
+ typedef Tuple7<A, B, C, D, E, F, G> param_type;
+ static void Write(Message* m, const param_type& p) {
+ WriteParam(m, p.a);
+ WriteParam(m, p.b);
+ WriteParam(m, p.c);
+ WriteParam(m, p.d);
+ WriteParam(m, p.e);
+ WriteParam(m, p.f);
+ WriteParam(m, p.g);
+ }
+ static bool Read(const Message* m, void** iter, param_type* r) {
+ return (ReadParam(m, iter, &r->a) &&
+ ReadParam(m, iter, &r->b) &&
+ ReadParam(m, iter, &r->c) &&
+ ReadParam(m, iter, &r->d) &&
+ ReadParam(m, iter, &r->e) &&
+ ReadParam(m, iter, &r->f) &&
+ ReadParam(m, iter, &r->g));
+ }
+ static void Log(const param_type& p, std::wstring* l) {
+ LogParam(p.a, l);
+ l->append(L", ");
+ LogParam(p.b, l);
+ l->append(L", ");
+ LogParam(p.c, l);
+ l->append(L", ");
+ LogParam(p.d, l);
+ l->append(L", ");
+ LogParam(p.e, l);
+ l->append(L", ");
+ LogParam(p.f, l);
+ l->append(L", ");
+ LogParam(p.g, l);
+ }
+};
+
//-----------------------------------------------------------------------------
diff --git a/chrome/common/worker_messages_internal.h b/chrome/common/worker_messages_internal.h
index 7691c79..41707fd 100644
--- a/chrome/common/worker_messages_internal.h
+++ b/chrome/common/worker_messages_internal.h
@@ -55,9 +55,10 @@ IPC_BEGIN_MESSAGES(WorkerHost)
int /* line_number */,
string16 /* source_url*/)
- IPC_MESSAGE_ROUTED6(WorkerHostMsg_PostConsoleMessageToWorkerObject,
+ IPC_MESSAGE_ROUTED7(WorkerHostMsg_PostConsoleMessageToWorkerObject,
int /* destination */,
int /* source */,
+ int /* type */,
int /* level */,
string16 /* message */,
int /* line_number */,
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 85a410b..84cf05f 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -93,12 +93,14 @@ void WebWorkerClientProxy::postExceptionToWorkerObject(
void WebWorkerClientProxy::postConsoleMessageToWorkerObject(
int destination,
int source,
+ int type,
int level,
const WebString& message,
int line_number,
const WebString& source_url) {
Send(new WorkerHostMsg_PostConsoleMessageToWorkerObject(
- route_id_, destination, source, level,message, line_number, source_url));
+ route_id_, destination, source, type, level,
+ message, line_number, source_url));
}
void WebWorkerClientProxy::confirmMessageFromWorkerObject(
diff --git a/chrome/worker/webworkerclient_proxy.h b/chrome/worker/webworkerclient_proxy.h
index ccff6f1..341c15a 100644
--- a/chrome/worker/webworkerclient_proxy.h
+++ b/chrome/worker/webworkerclient_proxy.h
@@ -33,6 +33,7 @@ class WebWorkerClientProxy : public WebKit::WebWorkerClient,
virtual void postConsoleMessageToWorkerObject(
int destination,
int source,
+ int type,
int level,
const WebKit::WebString& message,
int line_number,
diff --git a/webkit/api/public/WebWorkerClient.h b/webkit/api/public/WebWorkerClient.h
index 6c6f0db..a5faddd 100644
--- a/webkit/api/public/WebWorkerClient.h
+++ b/webkit/api/public/WebWorkerClient.h
@@ -1,10 +1,10 @@
/*
* 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
@@ -14,7 +14,7 @@
* * Neither the name of Google Inc. nor the names of its
* contributors may be used to endorse or promote products derived from
* this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -51,6 +51,7 @@ namespace WebKit {
virtual void postConsoleMessageToWorkerObject(
int destinationIdentifier,
int sourceIdentifier,
+ int messageType,
int messageLevel,
const WebString& message,
int lineNumber,
diff --git a/webkit/glue/chrome_client_impl.cc b/webkit/glue/chrome_client_impl.cc
index 53aca2e..d868767 100644
--- a/webkit/glue/chrome_client_impl.cc
+++ b/webkit/glue/chrome_client_impl.cc
@@ -312,6 +312,7 @@ void ChromeClientImpl::setResizable(bool value) {
}
void ChromeClientImpl::addMessageToConsole(WebCore::MessageSource source,
+ WebCore::MessageType type,
WebCore::MessageLevel level,
const WebCore::String& message,
unsigned int line_no,
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index 03478cd..cebffc2 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -70,6 +70,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
virtual void setResizable(bool);
virtual void addMessageToConsole(WebCore::MessageSource source,
+ WebCore::MessageType type,
WebCore::MessageLevel level,
const WebCore::String& message,
unsigned int lineNumber,
diff --git a/webkit/glue/webframe_impl.cc b/webkit/glue/webframe_impl.cc
index 73ae01bc..f74dd2c 100644
--- a/webkit/glue/webframe_impl.cc
+++ b/webkit/glue/webframe_impl.cc
@@ -1708,8 +1708,9 @@ void WebFrameImpl::AddMessageToConsole(const WebConsoleMessage& message) {
}
frame()->domWindow()->console()->addMessage(
- WebCore::OtherMessageSource, webcore_message_level,
- webkit_glue::WebStringToString(message.text), 1, String());
+ WebCore::OtherMessageSource, WebCore::LogMessageType,
+ webcore_message_level, webkit_glue::WebStringToString(message.text),
+ 1, String());
}
void WebFrameImpl::ClosePage() {
diff --git a/webkit/glue/webworker_impl.cc b/webkit/glue/webworker_impl.cc
index e42dbfe..4016e85 100644
--- a/webkit/glue/webworker_impl.cc
+++ b/webkit/glue/webworker_impl.cc
@@ -277,6 +277,7 @@ void WebWorkerImpl::PostExceptionTask(
void WebWorkerImpl::postConsoleMessageToWorkerObject(
WebCore::MessageDestination destination,
WebCore::MessageSource source,
+ WebCore::MessageType type,
WebCore::MessageLevel level,
const WebCore::String& message,
int line_number,
@@ -286,6 +287,7 @@ void WebWorkerImpl::postConsoleMessageToWorkerObject(
this,
static_cast<int>(destination),
static_cast<int>(source),
+ static_cast<int>(type),
static_cast<int>(level),
message,
line_number,
@@ -297,6 +299,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
WebWorkerImpl* this_ptr,
int destination,
int source,
+ int type,
int level,
const WebCore::String& message,
int line_number,
@@ -304,6 +307,7 @@ void WebWorkerImpl::PostConsoleMessageTask(
this_ptr->client_->postConsoleMessageToWorkerObject(
destination,
source,
+ type,
level,
webkit_glue::StringToWebString(message),
line_number,
diff --git a/webkit/glue/webworker_impl.h b/webkit/glue/webworker_impl.h
index f7daf42..0a1a3db 100644
--- a/webkit/glue/webworker_impl.h
+++ b/webkit/glue/webworker_impl.h
@@ -45,6 +45,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
virtual void postConsoleMessageToWorkerObject(
WebCore::MessageDestination destination,
WebCore::MessageSource source,
+ WebCore::MessageType type,
WebCore::MessageLevel level,
const WebCore::String& message,
int line_number,
@@ -104,6 +105,7 @@ class WebWorkerImpl: public WebCore::WorkerObjectProxy,
WebWorkerImpl* this_ptr,
int destination,
int source,
+ int type,
int level,
const WebCore::String& message,
int line_number,
diff --git a/webkit/glue/webworkerclient_impl.cc b/webkit/glue/webworkerclient_impl.cc
index d915ca7..22b7c17 100644
--- a/webkit/glue/webworkerclient_impl.cc
+++ b/webkit/glue/webworkerclient_impl.cc
@@ -221,6 +221,7 @@ void WebWorkerClientImpl::postExceptionToWorkerObject(
void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebString& message,
int line_number,
@@ -228,7 +229,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
if (WTF::currentThread() != worker_thread_id_) {
script_execution_context_->postTask(
WebCore::createCallbackTask(&PostConsoleMessageToWorkerObjectTask, this,
- destination_id, source_id, message_level,
+ destination_id, source_id, message_type, message_level,
webkit_glue::WebStringToString(message),
line_number,
webkit_glue::WebStringToString(source_url)));
@@ -238,6 +239,7 @@ void WebWorkerClientImpl::postConsoleMessageToWorkerObject(
script_execution_context_->addMessage(
static_cast<WebCore::MessageDestination>(destination_id),
static_cast<WebCore::MessageSource>(source_id),
+ static_cast<WebCore::MessageType>(message_type),
static_cast<WebCore::MessageLevel>(message_level),
webkit_glue::WebStringToString(message),
line_number,
@@ -332,6 +334,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
WebWorkerClientImpl* this_ptr,
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebCore::String& message,
int line_number,
@@ -339,6 +342,7 @@ void WebWorkerClientImpl::PostConsoleMessageToWorkerObjectTask(
this_ptr->script_execution_context_->addMessage(
static_cast<WebCore::MessageDestination>(destination_id),
static_cast<WebCore::MessageSource>(source_id),
+ static_cast<WebCore::MessageType>(message_type),
static_cast<WebCore::MessageLevel>(message_level),
message,
line_number,
diff --git a/webkit/glue/webworkerclient_impl.h b/webkit/glue/webworkerclient_impl.h
index b5f1aac..18422cf 100644
--- a/webkit/glue/webworkerclient_impl.h
+++ b/webkit/glue/webworkerclient_impl.h
@@ -56,6 +56,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
virtual void postConsoleMessageToWorkerObject(
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebKit::WebString& message,
int line_number,
@@ -110,6 +111,7 @@ class WebWorkerClientImpl : public WebCore::WorkerContextProxy,
WebWorkerClientImpl* this_ptr,
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebCore::String& message,
int line_number,
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 667f85c..0800316 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2843,3 +2843,36 @@ BUG16675 : LayoutTests/fast/dom/offset-parent-positioned-and-inline.html = CRASH
BUG16675 : LayoutTests/fast/images/favicon-as-image.html = CRASH
BUG16675 : LayoutTests/fast/images/pdf-as-background.html = CRASH
+// WebKit merge 42738:45840
+// Canvas-related failures.
+BUG16676 : LayoutTests/fast/canvas/canvas-composite-alpha.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-invalid-strokestyle.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-path-with-inf-nan-dimensions.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-set-properties-with-non-invertible-ctm.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-stroke-empty-fill.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-text-baseline.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/canvas-transforms-during-path.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/fill-stroke-clip-reset-path.html = FAIL
+BUG16676 : LayoutTests/fast/canvas/quadraticCurveTo.xml = FAIL
+
+// WebKit merge 42738:45840
+// New tests, need baseline.
+BUG16678 : LayoutTests/media/audio-data-url.html = FAIL
+BUG16678 : LayoutTests/fast/dom/replace-first-child.html = FAIL
+BUG16678 : LayoutTests/fast/text/international/khmer-selection.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/base-href-safe3.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/inline-event-HTML-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-control-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-named.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities-null-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-HTML-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-control-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link-null-char.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/javascript-link.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/link-onclick-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-src-redirect-safe.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-double-quote.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-entities.html = FAIL
+BUG16678 : LayoutTests/http/tests/security/xssAuditor/script-tag-with-source-no-quote.html = FAIL
+
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.cc b/webkit/tools/test_shell/test_worker/test_webworker.cc
index 29733b4..9adacd8 100644
--- a/webkit/tools/test_shell/test_worker/test_webworker.cc
+++ b/webkit/tools/test_shell/test_worker/test_webworker.cc
@@ -87,14 +87,15 @@ void TestWebWorker::postExceptionToWorkerObject(const WebString& error_message,
void TestWebWorker::postConsoleMessageToWorkerObject(
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebString& message,
int line_number,
const WebString& source_url) {
if (webworkerclient_delegate_)
webworkerclient_delegate_->postConsoleMessageToWorkerObject(
- destination_id, source_id, message_level, message, line_number,
- source_url);
+ destination_id, source_id, message_type, message_level,
+ message, line_number, source_url);
}
void TestWebWorker::confirmMessageFromWorkerObject(bool has_pending_activity) {
diff --git a/webkit/tools/test_shell/test_worker/test_webworker.h b/webkit/tools/test_shell/test_worker/test_webworker.h
index 171b09c..f0ee118 100644
--- a/webkit/tools/test_shell/test_worker/test_webworker.h
+++ b/webkit/tools/test_shell/test_worker/test_webworker.h
@@ -41,6 +41,7 @@ class TestWebWorker : public WebKit::WebWorker,
virtual void postConsoleMessageToWorkerObject(
int destination_id,
int source_id,
+ int message_type,
int message_level,
const WebKit::WebString& message,
int line_number,
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 7f428c3..308fb5f 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -708,6 +708,7 @@
'../third_party/WebKit/WebCore/dom/EventException.idl',
'../third_party/WebKit/WebCore/dom/EventListener.idl',
'../third_party/WebKit/WebCore/dom/EventTarget.idl',
+ '../third_party/WebKit/WebCore/dom/HTMLAllCollection.idl',
'../third_party/WebKit/WebCore/dom/KeyboardEvent.idl',
'../third_party/WebKit/WebCore/dom/MessageChannel.idl',
'../third_party/WebKit/WebCore/dom/MessageEvent.idl',
@@ -3196,6 +3197,7 @@
'../third_party/WebKit/WebCore/rendering/RenderBR.h',
'../third_party/WebKit/WebCore/rendering/RenderBlock.cpp',
'../third_party/WebKit/WebCore/rendering/RenderBlock.h',
+ '../third_party/WebKit/WebCore/rendering/RenderBlockLineLayout.cpp',
'../third_party/WebKit/WebCore/rendering/RenderBox.cpp',
'../third_party/WebKit/WebCore/rendering/RenderBox.h',
'../third_party/WebKit/WebCore/rendering/RenderBoxModelObject.cpp',
@@ -3364,8 +3366,6 @@
'../third_party/WebKit/WebCore/rendering/TextControlInnerElements.h',
'../third_party/WebKit/WebCore/rendering/TransformState.cpp',
'../third_party/WebKit/WebCore/rendering/TransformState.h',
- '../third_party/WebKit/WebCore/rendering/bidi.cpp',
- '../third_party/WebKit/WebCore/rendering/bidi.h',
'../third_party/WebKit/WebCore/rendering/break_lines.cpp',
'../third_party/WebKit/WebCore/rendering/break_lines.h',
'../third_party/WebKit/WebCore/storage/ChangeVersionWrapper.cpp',
generated by cgit v1.1 at 2025-01-19 05:16:59 +0000