summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS4
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/JavaScriptCore/SConscript1
-rw-r--r--webkit/build/JavaScriptCore/WTF.vcproj4
-rw-r--r--webkit/build/WebCore/SConscript4
-rw-r--r--webkit/build/WebCore/WebCore.vcproj48
-rw-r--r--webkit/glue/webtextinput_impl.cc9
-rw-r--r--webkit/webkit.gyp10
8 files changed, 53 insertions, 29 deletions
diff --git a/DEPS b/DEPS
index 6b546c1..fbc418b 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "41530",
+ "webkit_revision": "41559",
}
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@11353",
+ "/trunk/deps/third_party/WebKit@11399",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@11389",
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 3bf856f..c7d3fef 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@41530 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@41559 \ No newline at end of file
diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index b8c612c..08c577c 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -149,7 +149,6 @@ wtf_inputs = [
'$WTF_DIR/ByteArray.cpp',
'$WTF_DIR/Assertions.cpp',
'$WTF_DIR/chromium/MainThreadChromium.cpp',
- '$WTF_DIR/CurrentTime.cpp',
'$WTF_DIR/dtoa.cpp',
'$WTF_DIR/FastMalloc.cpp',
'$WTF_DIR/HashTable.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 502ca67..77bc8ef 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -170,6 +170,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
>
</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index abce154..ee72102 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -342,6 +342,8 @@ input_files = [
'$WEBCORE_DIR/loader/CachedScript.cpp',
'$WEBCORE_DIR/loader/CachedXBLDocument.cpp',
'$WEBCORE_DIR/loader/CachedXSLStyleSheet.cpp',
+ '$WEBCORE_DIR/loader/CrossOriginAccessControl.cpp',
+ '$WEBCORE_DIR/loader/CrossOriginPreflightResultCache.cpp',
'$WEBCORE_DIR/loader/DocLoader.cpp',
'$WEBCORE_DIR/loader/DocumentLoader.cpp',
'$WEBCORE_DIR/loader/DocumentThreadableLoader.cpp',
@@ -587,7 +589,6 @@ input_files = [
'$WEBCORE_DIR/platform/text/TextCodecLatin1.cpp',
'$WEBCORE_DIR/platform/text/TextCodecUserDefined.cpp',
'$WEBCORE_DIR/platform/text/TextCodecUTF16.cpp',
- '$WEBCORE_DIR/platform/text/TextDecoder.cpp',
'$WEBCORE_DIR/platform/text/TextEncoding.cpp',
'$WEBCORE_DIR/platform/text/TextEncodingRegistry.cpp',
'$WEBCORE_DIR/platform/text/TextStream.cpp',
@@ -886,6 +887,7 @@ input_files = [
'$WEBCORE_DIR/workers/Worker.cpp',
'$WEBCORE_DIR/workers/WorkerContext.cpp',
+ '$WEBCORE_DIR/workers/WorkerImportScriptsClient.cpp',
'$WEBCORE_DIR/workers/WorkerLocation.cpp',
'$WEBCORE_DIR/workers/WorkerMessagingProxy.cpp',
'$WEBCORE_DIR/workers/WorkerRunLoop.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 9f2040b..9e58f3c 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -673,6 +673,22 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginAccessControl.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\loader\CrossOriginPreflightResultCache.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\loader\DocLoader.cpp"
>
</File>
@@ -2112,14 +2128,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDecoder.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\text\TextDirection.h"
>
</File>
@@ -3745,6 +3753,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\SVGCharacterLayoutInfo.cpp"
>
</File>
@@ -3793,14 +3809,6 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.cpp"
- >
- </File>
- <File
- RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\ScrollBehavior.h"
- >
- </File>
- <File
RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\TableLayout.h"
>
</File>
@@ -7437,6 +7445,14 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerImportScriptsClient.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\workers\WorkerLocation.cpp"
>
</File>
diff --git a/webkit/glue/webtextinput_impl.cc b/webkit/glue/webtextinput_impl.cc
index 3155863..e169dbd 100644
--- a/webkit/glue/webtextinput_impl.cc
+++ b/webkit/glue/webtextinput_impl.cc
@@ -112,8 +112,8 @@ void WebTextInputImpl::MarkedRange(std::string* range_str) {
// Range::toString() returns a string different from what test expects.
// So we need to construct the string ourselves.
- SStringPrintf(range_str, "%d,%d", range->startPosition().offset(),
- range->endPosition().offset());
+ SStringPrintf(range_str, "%d,%d", range->startPosition().m_offset,
+ range->endPosition().m_offset);
}
void WebTextInputImpl::SelectedRange(std::string* range_str) {
@@ -122,8 +122,8 @@ void WebTextInputImpl::SelectedRange(std::string* range_str) {
// Range::toString() returns a string different from what test expects.
// So we need to construct the string ourselves.
- SStringPrintf(range_str, "%d,%d", range.get()->startPosition().offset(),
- range.get()->endPosition().offset());
+ SStringPrintf(range_str, "%d,%d", range.get()->startPosition().m_offset,
+ range.get()->endPosition().m_offset);
}
void WebTextInputImpl::FirstRectForCharacterRange(int32_t location,
@@ -153,4 +153,3 @@ void WebTextInputImpl::DeleteToEndOfParagraph() {
false);
}
}
-
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 1d57683..4bf64c3 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -231,8 +231,8 @@
'../third_party/WebKit/JavaScriptCore/wtf/Assertions.h',
'../third_party/WebKit/JavaScriptCore/wtf/ByteArray.cpp',
'../third_party/WebKit/JavaScriptCore/wtf/ByteArray.h',
- '../third_party/WebKit/JavaScriptCore/wtf/CurrentTime.cpp',
'../third_party/WebKit/JavaScriptCore/wtf/CurrentTime.h',
+ '../third_party/WebKit/JavaScriptCore/wtf/CrossThreadRefCounted.h',
'../third_party/WebKit/JavaScriptCore/wtf/Deque.h',
'../third_party/WebKit/JavaScriptCore/wtf/DisallowCType.h',
'../third_party/WebKit/JavaScriptCore/wtf/FastMalloc.cpp',
@@ -1765,6 +1765,10 @@
'../third_party/WebKit/WebCore/loader/CachedXBLDocument.h',
'../third_party/WebKit/WebCore/loader/CachedXSLStyleSheet.cpp',
'../third_party/WebKit/WebCore/loader/CachedXSLStyleSheet.h',
+ '../third_party/WebKit/WebCore/loader/CrossOriginAccessControl.cpp',
+ '../third_party/WebKit/WebCore/loader/CrossOriginAccessControl.h',
+ '../third_party/WebKit/WebCore/loader/CrossOriginPreflightResultCache.cpp',
+ '../third_party/WebKit/WebCore/loader/CrossOriginPreflightResultCache.h',
'../third_party/WebKit/WebCore/loader/DocLoader.cpp',
'../third_party/WebKit/WebCore/loader/DocLoader.h',
'../third_party/WebKit/WebCore/loader/DocumentLoader.cpp',
@@ -2743,8 +2747,6 @@
'../third_party/WebKit/WebCore/platform/text/TextCodecUTF16.h',
'../third_party/WebKit/WebCore/platform/text/TextCodecUserDefined.cpp',
'../third_party/WebKit/WebCore/platform/text/TextCodecUserDefined.h',
- '../third_party/WebKit/WebCore/platform/text/TextDecoder.cpp',
- '../third_party/WebKit/WebCore/platform/text/TextDecoder.h',
'../third_party/WebKit/WebCore/platform/text/TextDirection.h',
'../third_party/WebKit/WebCore/platform/text/TextEncoding.cpp',
'../third_party/WebKit/WebCore/platform/text/TextEncoding.h',
@@ -3669,6 +3671,8 @@
'../third_party/WebKit/WebCore/workers/WorkerContext.cpp',
'../third_party/WebKit/WebCore/workers/WorkerContext.h',
'../third_party/WebKit/WebCore/workers/WorkerContextProxy.h',
+ '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.cpp',
+ '../third_party/WebKit/WebCore/workers/WorkerImportScriptsClient.h',
'../third_party/WebKit/WebCore/workers/WorkerLocation.cpp',
'../third_party/WebKit/WebCore/workers/WorkerLocation.h',
'../third_party/WebKit/WebCore/workers/WorkerMessagingProxy.cpp',
generated by cgit v1.1 at 2025-01-30 12:21:48 +0000