summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS8
-rw-r--r--WEBKIT_MERGE_REVISION2
-rw-r--r--webkit/build/WebCore/WebCore.vcproj30
-rw-r--r--webkit/glue/editor_client_impl.cc9
-rw-r--r--webkit/glue/editor_client_impl.h1
-rw-r--r--webkit/glue/webframeloaderclient_impl.cc2
-rw-r--r--webkit/glue/webframeloaderclient_impl.h2
-rw-r--r--webkit/glue/webview_delegate.h9
-rw-r--r--webkit/port/platform/GKURL.cpp10
-rw-r--r--webkit/webkit.xcodeproj/project.pbxproj6
10 files changed, 62 insertions, 17 deletions
diff --git a/DEPS b/DEPS
index 53d44b8..4a4aedc 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@63",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@6159",
+ "/trunk/deps/third_party/WebKit@6182",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@5827",
@@ -21,13 +21,13 @@ deps = {
"http://v8.googlecode.com/svn/trunk@851",
"src/webkit/data/layout_tests/LayoutTests":
- "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38729",
+ "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38760",
"src/third_party/WebKit/WebKit":
- "http://svn.webkit.org/repository/webkit/trunk/WebKit@38729",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKit@38760",
"src/third_party/WebKit/WebKitLibraries":
- "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38729",
+ "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38760",
}
diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION
index 610c8b5..b8beb82 100644
--- a/WEBKIT_MERGE_REVISION
+++ b/WEBKIT_MERGE_REVISION
@@ -1 +1 @@
-http://svn.webkit.org/repository/webkit/trunk@38729 \ No newline at end of file
+http://svn.webkit.org/repository/webkit/trunk@38760 \ No newline at end of file
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 000139a..2cc81e7 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -252,6 +252,14 @@
<File
RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.cpp"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ GeneratePreprocessedFile="0"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\third_party\WebKit\WebCore\page\Console.h"
@@ -958,23 +966,23 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphBuffer.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.cpp"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.cpp"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\GeolocationService.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\GlyphPageTreeNode.h"
>
</File>
<File
@@ -1009,7 +1017,7 @@
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LengthSize.h"
>
</File>
- <File
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\LinkHash.cpp"
>
</File>
@@ -1082,6 +1090,10 @@
>
</File>
<File
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\PurgeableBuffer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ScrollBar.cpp"
>
</File>
@@ -1154,15 +1166,15 @@
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Theme.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Theme.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThemeTypes.h"
>
</File>
<File
- RelativePath="..\..\..\third_party\WebKit\WebCore\platform\ThemeTypes.h"
+ RelativePath="..\..\..\third_party\WebKit\WebCore\platform\Threading.h"
>
</File>
<File
diff --git a/webkit/glue/editor_client_impl.cc b/webkit/glue/editor_client_impl.cc
index d6b2e2c..abf2ecf 100644
--- a/webkit/glue/editor_client_impl.cc
+++ b/webkit/glue/editor_client_impl.cc
@@ -104,6 +104,15 @@ bool EditorClientImpl::smartInsertDeleteEnabled() {
return true;
}
+bool EditorClientImpl::isSelectTrailingWhitespaceEnabled() {
+ if (use_editor_delegate_) {
+ WebViewDelegate* d = web_view_->delegate();
+ if (d)
+ return d->IsSelectTrailingWhitespaceEnabled();
+ }
+ return true;
+}
+
bool EditorClientImpl::isContinuousSpellCheckingEnabled() {
// Spell check everything if possible.
// FIXME(brettw) This should be modified to do reasonable defaults depending
diff --git a/webkit/glue/editor_client_impl.h b/webkit/glue/editor_client_impl.h
index 4d0f057..52f725a 100644
--- a/webkit/glue/editor_client_impl.h
+++ b/webkit/glue/editor_client_impl.h
@@ -34,6 +34,7 @@ class EditorClientImpl : public WebCore::EditorClient {
virtual bool shouldShowDeleteInterface(WebCore::HTMLElement*);
virtual bool smartInsertDeleteEnabled();
+ virtual bool isSelectTrailingWhitespaceEnabled();
virtual bool isContinuousSpellCheckingEnabled();
virtual void toggleContinuousSpellChecking();
virtual bool isGrammarCheckingEnabled();
diff --git a/webkit/glue/webframeloaderclient_impl.cc b/webkit/glue/webframeloaderclient_impl.cc
index 5983854..21b3938 100644
--- a/webkit/glue/webframeloaderclient_impl.cc
+++ b/webkit/glue/webframeloaderclient_impl.cc
@@ -1081,7 +1081,7 @@ void WebFrameLoaderClient::finishedLoading(DocumentLoader* dl) {
}
}
-void WebFrameLoaderClient::updateGlobalHistory(const KURL& kurl) {
+void WebFrameLoaderClient::updateGlobalHistory() {
}
bool WebFrameLoaderClient::shouldGoToHistoryItem(HistoryItem*) const {
diff --git a/webkit/glue/webframeloaderclient_impl.h b/webkit/glue/webframeloaderclient_impl.h
index 70c124b..ad41622 100644
--- a/webkit/glue/webframeloaderclient_impl.h
+++ b/webkit/glue/webframeloaderclient_impl.h
@@ -116,7 +116,7 @@ class WebFrameLoaderClient : public WebCore::FrameLoaderClient {
virtual void committedLoad(WebCore::DocumentLoader*, const char*, int);
virtual void finishedLoading(WebCore::DocumentLoader*);
- virtual void updateGlobalHistory(const WebCore::KURL&);
+ virtual void updateGlobalHistory();
virtual bool shouldGoToHistoryItem(WebCore::HistoryItem*) const;
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
diff --git a/webkit/glue/webview_delegate.h b/webkit/glue/webview_delegate.h
index 1987999..6ea074c 100644
--- a/webkit/glue/webview_delegate.h
+++ b/webkit/glue/webview_delegate.h
@@ -633,6 +633,15 @@ class WebViewDelegate : virtual public WebWidgetDelegate {
virtual bool SmartInsertDeleteEnabled() {
return false;
}
+
+ virtual bool IsSelectTrailingWhitespaceEnabled() {
+#if defined(OS_WIN)
+ return true;
+#else
+ return false;
+#endif
+ }
+
virtual void DidBeginEditing() { }
virtual void DidChangeSelection(bool is_empty_selection) { }
virtual void DidChangeContents() { }
diff --git a/webkit/port/platform/GKURL.cpp b/webkit/port/platform/GKURL.cpp
index f738786..9a81aff 100644
--- a/webkit/port/platform/GKURL.cpp
+++ b/webkit/port/platform/GKURL.cpp
@@ -194,7 +194,7 @@ KURL::KURL(const KURL& base,
const String& relative,
const TextEncoding& encoding)
{
- init(base, relative, &encoding);
+ init(base, relative, &encoding.encodingForFormSubmission());
}
KURL::KURL(const char* canonical_spec, int canonical_spec_len,
@@ -319,6 +319,14 @@ void KURL::init(const KURL& base, const UChar* rel, int rel_len,
}
}
+KURL KURL::copy() const
+{
+ KURL result = *this;
+ // TODO(brettw): http://crbug.com/4975 Make this a deep copy.
+ // result.m_string = result.m_string.copy();
+ return result;
+}
+
bool KURL::hasPath() const
{
// Note that http://www.google.com/" has a path, the path is "/". This can
diff --git a/webkit/webkit.xcodeproj/project.pbxproj b/webkit/webkit.xcodeproj/project.pbxproj
index ef8b971..4a95530 100644
--- a/webkit/webkit.xcodeproj/project.pbxproj
+++ b/webkit/webkit.xcodeproj/project.pbxproj
@@ -466,6 +466,7 @@
93BF8E9B0EA6B0EF0030F05C /* DNSChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E620EA6AED30030F05C /* DNSChromium.cpp */; };
93BF8E9C0EA6B0F30030F05C /* NetworkStateNotifierChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8E630EA6AED30030F05C /* NetworkStateNotifierChromium.cpp */; };
93BF8F520EA6BD870030F05C /* AccessibilityObjectChromium.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93BF8F510EA6BD870030F05C /* AccessibilityObjectChromium.cpp */; };
+ A80DD9190EE4A87900728DDE /* PurgeableBufferMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */; };
AB332F3E0E9548900020F882 /* AccessibilityObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 82761F810E3FAC700030D324 /* AccessibilityObject.cpp */; };
AB332F4D0E95497E0020F882 /* AnimationController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AB332F4B0E95497E0020F882 /* AnimationController.cpp */; };
AB451D9D0EC21EDE0037A496 /* ColorSkia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B5E90050D7F3CC1001ECF42 /* ColorSkia.cpp */; };
@@ -3981,6 +3982,8 @@
93BF8E650EA6AED30030F05C /* ResourceRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceRequest.h; path = chromium/ResourceRequest.h; sourceTree = "<group>"; };
93BF8E660EA6AED30030F05C /* ResourceResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResourceResponse.h; path = chromium/ResourceResponse.h; sourceTree = "<group>"; };
93BF8F510EA6BD870030F05C /* AccessibilityObjectChromium.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityObjectChromium.cpp; sourceTree = "<group>"; };
+ A80DD9160EE4A85900728DDE /* PurgeableBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgeableBuffer.h; sourceTree = "<group>"; };
+ A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PurgeableBufferMac.cpp; sourceTree = "<group>"; };
AB332F4B0E95497E0020F882 /* AnimationController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AnimationController.cpp; path = animation/AnimationController.cpp; sourceTree = "<group>"; };
AB332F4C0E95497E0020F882 /* AnimationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AnimationController.h; path = animation/AnimationController.h; sourceTree = "<group>"; };
AB50EA1C0E9AB12B00FDD61B /* EmptyClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmptyClients.h; sourceTree = "<group>"; };
@@ -5648,6 +5651,7 @@
7B5E915A0D7F3CC2001ECF42 /* PopupMenu.h */,
7B5E915B0D7F3CC2001ECF42 /* PopupMenuClient.h */,
4D16411B0EC29D01008F024E /* PopupMenuStyle.h */,
+ A80DD9160EE4A85900728DDE /* PurgeableBuffer.h */,
7B5E91870D7F3CC2001ECF42 /* Scrollbar.cpp */,
7B5E91880D7F3CC2001ECF42 /* Scrollbar.h */,
ABBD24C10EB7C17E00BEC658 /* ScrollbarClient.h */,
@@ -5833,6 +5837,7 @@
7B5E90E90D7F3CC2001ECF42 /* LocalCurrentGraphicsContext.mm */,
7B5E90EB0D7F3CC2001ECF42 /* LoggingMac.mm */,
7B5E90ED0D7F3CC2001ECF42 /* PasteboardHelper.h */,
+ A80DD9180EE4A87900728DDE /* PurgeableBufferMac.cpp */,
7B5E90F10D7F3CC2001ECF42 /* ScrollbarThemeMac.h */,
7B5E90F20D7F3CC2001ECF42 /* ScrollbarThemeMac.mm */,
7B5E90F90D7F3CC2001ECF42 /* SoftLinking.h */,
@@ -9290,6 +9295,7 @@
E456266F0E268E87005E4685 /* XSLTExtensions.cpp in Sources */,
E45626700E268E87005E4685 /* XSLTProcessor.cpp in Sources */,
E45626710E268E87005E4685 /* XSLTUnicodeSort.cpp in Sources */,
+ A80DD9190EE4A87900728DDE /* PurgeableBufferMac.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
generated by cgit v1.1 at 2025-01-22 05:14:58 +0000