summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--webkit/glue/chrome_client_impl.h2
-rw-r--r--webkit/glue/dom_operations.cc4
-rw-r--r--webkit/glue/password_autocomplete_listener.cc2
-rw-r--r--webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp24
-rw-r--r--webkit/webkit.gyp9
6 files changed, 26 insertions, 17 deletions
diff --git a/DEPS b/DEPS
index 6318d0e..4ebea5e 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "44094",
+ "webkit_revision": "44123",
}
diff --git a/webkit/glue/chrome_client_impl.h b/webkit/glue/chrome_client_impl.h
index bcdf7a0..ed75747 100644
--- a/webkit/glue/chrome_client_impl.h
+++ b/webkit/glue/chrome_client_impl.h
@@ -137,7 +137,7 @@ class ChromeClientImpl : public WebCore::ChromeClientChromium {
virtual void formStateDidChange(const WebCore::Node*);
- virtual WebCore::HTMLParserQuirks* createHTMLParserQuirks() { return 0; }
+ virtual PassOwnPtr<WebCore::HTMLParserQuirks> createHTMLParserQuirks() { return 0; }
private:
WebViewImpl* webview_; // weak pointer
diff --git a/webkit/glue/dom_operations.cc b/webkit/glue/dom_operations.cc
index f0adc1a..16f364a 100644
--- a/webkit/glue/dom_operations.cc
+++ b/webkit/glue/dom_operations.cc
@@ -236,7 +236,7 @@ static bool FillFormToUploadFileImpl(WebCore::HTMLFormElement* fe,
std::vector<WebCore::HTMLInputElement*>::iterator changed_ie;
for (changed_ie = changed.begin(); changed_ie != changed.end();
++changed_ie) {
- (*changed_ie)->onChange();
+ (*changed_ie)->dispatchFormControlChangeEvent();
(*changed_ie)->deref();
}
@@ -302,7 +302,7 @@ static bool FillFormImpl(FormElements* fe, const FormData& data, bool submit) {
continue;
it->second->setValue(StdWStringToString(data_map[it->first]));
it->second->setAutofilled(true);
- it->second->onChange();
+ it->second->dispatchFormControlChangeEvent();
}
if (submit && submit_found) {
diff --git a/webkit/glue/password_autocomplete_listener.cc b/webkit/glue/password_autocomplete_listener.cc
index 0797d475..1b4260c 100644
--- a/webkit/glue/password_autocomplete_listener.cc
+++ b/webkit/glue/password_autocomplete_listener.cc
@@ -38,7 +38,7 @@ void HTMLInputDelegate::OnFinishedAutocompleting() {
// having a yellow background.
element_->setAutofilled(true);
// Notify any changeEvent listeners.
- element_->onChange();
+ element_->dispatchFormControlChangeEvent();
}
PasswordAutocompleteListener::PasswordAutocompleteListener(
diff --git a/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp b/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
index ce801ff..c6dca00 100644
--- a/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
+++ b/webkit/tools/webcore_unit_tests/TransparencyWin_unittest.cpp
@@ -103,7 +103,7 @@ static std::ostream& operator<<(std::ostream& out, const Color& c)
TEST(TransparencyWin, NoLayer)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// KeepTransform
{
@@ -142,7 +142,7 @@ TEST(TransparencyWin, NoLayer)
TEST(TransparencyWin, WhiteLayer)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// KeepTransform
{
@@ -194,7 +194,7 @@ TEST(TransparencyWin, WhiteLayer)
TEST(TransparencyWin, TextComposite)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// KeepTransform is the only valid transform mode for TextComposite.
{
@@ -213,7 +213,7 @@ TEST(TransparencyWin, TextComposite)
TEST(TransparencyWin, OpaqueCompositeLayer)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// KeepTransform
{
@@ -283,7 +283,7 @@ TEST(TransparencyWin, OpaqueCompositeLayer)
TEST(TransparencyWin, WhiteLayerPixelTest)
{
// Make a total transparent buffer, and draw the white layer inset by 1 px.
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
{
TransparencyWin helper;
@@ -312,7 +312,7 @@ TEST(TransparencyWin, OpaqueCompositeLayerPixel)
Color green(0xFF00FF00);
// Make a red bottom layer, followed by a half green next layer @ 50%.
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
FloatRect fullRect(0, 0, 16, 16);
src->context()->fillRect(fullRect, red);
@@ -365,7 +365,7 @@ TEST(TransparencyWin, OpaqueCompositeLayerPixel)
TEST(TransparencyWin, TranslateOpaqueCompositeLayer)
{
// Fill with white.
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
Color white(0xFFFFFFFF);
FloatRect fullRect(0, 0, 16, 16);
src->context()->fillRect(fullRect, white);
@@ -402,7 +402,7 @@ TEST(TransparencyWin, TranslateOpaqueCompositeLayer)
// tests that the propert transform is applied to the copied layer.
TEST(TransparencyWin, RotateOpaqueCompositeLayer)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// The background is white.
Color white(0xFFFFFFFF);
@@ -484,7 +484,7 @@ TEST(TransparencyWin, RotateOpaqueCompositeLayer)
TEST(TransparencyWin, TranslateScaleOpaqueCompositeLayer)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// The background is white on top with red on bottom.
Color white(0xFFFFFFFF);
@@ -532,7 +532,7 @@ TEST(TransparencyWin, TranslateScaleOpaqueCompositeLayer)
TEST(TransparencyWin, Scale)
{
// Create an opaque white buffer.
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
FloatRect fullBuffer(0, 0, 16, 16);
src->context()->fillRect(fullBuffer, Color::white);
@@ -587,7 +587,7 @@ TEST(TransparencyWin, Scale)
TEST(TransparencyWin, ScaleTransparency)
{
// Create an opaque white buffer.
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
FloatRect fullBuffer(0, 0, 16, 16);
src->context()->fillRect(fullBuffer, Color::white);
@@ -645,7 +645,7 @@ TEST(TransparencyWin, ScaleTransparency)
TEST(TransparencyWin, Text)
{
- std::auto_ptr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
+ OwnPtr<ImageBuffer> src(ImageBuffer::create(IntSize(16, 16), false));
// Our text should end up 50% transparent blue-green.
Color fullResult(0x80008080);
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index ca4edf1..194c3a9 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -278,7 +278,9 @@
'../third_party/WebKit/JavaScriptCore/wtf/NotFound.h',
'../third_party/WebKit/JavaScriptCore/wtf/OwnArrayPtr.h',
'../third_party/WebKit/JavaScriptCore/wtf/OwnPtr.h',
+ '../third_party/WebKit/JavaScriptCore/wtf/OwnPtrCommon.h',
'../third_party/WebKit/JavaScriptCore/wtf/OwnPtrWin.cpp',
+ '../third_party/WebKit/JavaScriptCore/wtf/PassOwnPtr.h',
'../third_party/WebKit/JavaScriptCore/wtf/PassRefPtr.h',
'../third_party/WebKit/JavaScriptCore/wtf/Platform.h',
'../third_party/WebKit/JavaScriptCore/wtf/PtrAndFlags.h',
@@ -1471,6 +1473,8 @@
'../third_party/WebKit/WebCore/dom/ScriptElement.h',
'../third_party/WebKit/WebCore/dom/ScriptExecutionContext.cpp',
'../third_party/WebKit/WebCore/dom/ScriptExecutionContext.h',
+ '../third_party/WebKit/WebCore/dom/SelectElement.cpp',
+ '../third_party/WebKit/WebCore/dom/SelectElement.h',
'../third_party/WebKit/WebCore/dom/SelectorNodeList.cpp',
'../third_party/WebKit/WebCore/dom/SelectorNodeList.h',
'../third_party/WebKit/WebCore/dom/StaticNodeList.cpp',
@@ -2210,6 +2214,10 @@
'../third_party/WebKit/WebCore/platform/graphics/filters/FEComponentTransfer.h',
'../third_party/WebKit/WebCore/platform/graphics/filters/FEComposite.cpp',
'../third_party/WebKit/WebCore/platform/graphics/filters/FEComposite.h',
+ '../third_party/WebKit/WebCore/platform/graphics/filters/SourceAlpha.cpp',
+ '../third_party/WebKit/WebCore/platform/graphics/filters/SourceAlpha.h',
+ '../third_party/WebKit/WebCore/platform/graphics/filters/SourceGraphic.cpp',
+ '../third_party/WebKit/WebCore/platform/graphics/filters/SourceGraphic.h',
'../third_party/WebKit/WebCore/platform/graphics/gtk/ColorGtk.cpp',
'../third_party/WebKit/WebCore/platform/graphics/gtk/FontCacheGtk.cpp',
'../third_party/WebKit/WebCore/platform/graphics/gtk/FontCustomPlatformData.cpp',
@@ -3484,6 +3492,7 @@
'../third_party/WebKit/WebCore/svg/Filter.cpp',
'../third_party/WebKit/WebCore/svg/Filter.h',
'../third_party/WebKit/WebCore/svg/FilterBuilder.h',
+ '../third_party/WebKit/WebCore/svg/FilterBuilder.cpp',
'../third_party/WebKit/WebCore/svg/FilterEffect.cpp',
'../third_party/WebKit/WebCore/svg/FilterEffect.h',
'../third_party/WebKit/WebCore/svg/GradientAttributes.h',
generated by cgit v1.1 at 2025-02-13 20:16:18 +0000