diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 18:17:50 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 18:17:50 +0000 |
| commit | eeb0198ccfef0a12aa1a5d112b619ec3d820fe89 (patch) | |
| tree | fdbfc4a09258664b5824226264dad4babde53a9b | |
| parent | 90f153f6672c8e7720533191658bbea60e1bce80 (diff) | |
| download | chromium_src-eeb0198ccfef0a12aa1a5d112b619ec3d820fe89.zip chromium_src-eeb0198ccfef0a12aa1a5d112b619ec3d820fe89.tar.gz chromium_src-eeb0198ccfef0a12aa1a5d112b619ec3d820fe89.tar.bz2 | |
WebKit Merge 38800:38850, Part 3
Review URL: http://codereview.chromium.org/13118
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6361 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 8 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/port/page/chromium/DragControllerChromium.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@6342", + "/trunk/deps/third_party/WebKit@6360", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5827", @@ -21,13 +21,13 @@ deps = { "http://v8.googlecode.com/svn/trunk@911", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38800", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38850", "src/third_party/WebKit/WebKit": - "http://svn.webkit.org/repository/webkit/trunk/WebKit@38800", + "http://svn.webkit.org/repository/webkit/trunk/WebKit@38850", "src/third_party/WebKit/WebKitLibraries": - "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38800", + "http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries@38850", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 6575779..9ce7512 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38800
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@38850
\ No newline at end of file diff --git a/webkit/port/page/chromium/DragControllerChromium.cpp b/webkit/port/page/chromium/DragControllerChromium.cpp index 23ad070..7642ea3 100644 --- a/webkit/port/page/chromium/DragControllerChromium.cpp +++ b/webkit/port/page/chromium/DragControllerChromium.cpp @@ -70,4 +70,8 @@ const IntSize& DragController::maxDragImageSize() return maxDragImageSize; } +void DragController::cleanupAfterSystemDrag() +{ +} + } |