[webkit-changes] [145572] branches/chromium/1438/
Title: [145572] branches/chromium/1438/ Revision 145572 Author k...@chromium.org Date 2013-03-12 11:41:24 -0700 (Tue, 12 Mar 2013) Log Message Quick branch for Chromium Added Paths branches/chromium/1438/ Diff Property changes: branches/chromium/1438 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [142041] branches/chromium/1364
Title: [142041] branches/chromium/1364 Revision 142041 Author k...@chromium.org Date 2013-02-06 15:06:56 -0800 (Wed, 06 Feb 2013) Log Message Revert 141898 > Disable Fullscreen API on Android. > > Disable the fullscreen API, as it is not working correctly on Android. > > BUG=173664 > Review URL: https://codereview.chromium.org/12208016 TBR=jknot...@chromium.org Review URL: https://codereview.chromium.org/12225065 Modified Paths branches/chromium/1364/LayoutTests/platform/chromium-android/TestExpectations branches/chromium/1364/Source/WebKit/chromium/features.gypi Diff Modified: branches/chromium/1364/LayoutTests/platform/chromium-android/TestExpectations (142040 => 142041) --- branches/chromium/1364/LayoutTests/platform/chromium-android/TestExpectations 2013-02-06 22:59:59 UTC (rev 142040) +++ branches/chromium/1364/LayoutTests/platform/chromium-android/TestExpectations 2013-02-06 23:06:56 UTC (rev 142041) @@ -64,9 +64,6 @@ crbug.com/135877 platform/chromium/virtual/gpu/fast/canvas/webgl crbug.com/135877 platform/chromium/virtual/threaded/compositing/webgl -# Fullscreen API disabled: http://crbug.com/173664 -crbug.com/173664 fullscreen - # LAYER_TREE_INCLUDES_VISIBLE_RECTS option to layerTreeAsText is only applicable to Mac. compositing/visible-rect [ WontFix ] Modified: branches/chromium/1364/Source/WebKit/chromium/features.gypi (142040 => 142041) --- branches/chromium/1364/Source/WebKit/chromium/features.gypi 2013-02-06 22:59:59 UTC (rev 142040) +++ branches/chromium/1364/Source/WebKit/chromium/features.gypi 2013-02-06 23:06:56 UTC (rev 142041) @@ -63,6 +63,7 @@ 'ENABLE_ENCRYPTED_MEDIA=1', 'ENABLE_FILE_SYSTEM=1', 'ENABLE_FILTERS=1', + 'ENABLE_FULLSCREEN_API=1', 'ENABLE_GAMEPAD=1', 'ENABLE_GEOLOCATION=1', 'ENABLE_GESTURE_EVENTS=1', @@ -162,7 +163,6 @@ 'ENABLE_CALENDAR_PICKER=0', 'ENABLE_DATALIST_ELEMENT=0', 'ENABLE_FAST_MOBILE_SCROLLING=1', - 'ENABLE_FULLSCREEN_API=0', 'ENABLE_INPUT_SPEECH=0', 'ENABLE_INPUT_TYPE_COLOR=0', 'ENABLE_INPUT_TYPE_WEEK=0', @@ -186,7 +186,6 @@ 'ENABLE_ACCELERATED_OVERFLOW_SCROLLING=0', 'ENABLE_CALENDAR_PICKER=1', 'ENABLE_DATALIST_ELEMENT=1', - 'ENABLE_FULLSCREEN_API=1', 'ENABLE_INPUT_SPEECH=1', 'ENABLE_INPUT_TYPE_COLOR=1', 'ENABLE_INPUT_TYPE_WEEK=1', ___ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [142010] branches/chromium/1364/Source/WebKit/chromium
Title: [142010] branches/chromium/1364/Source/WebKit/chromium Revision 142010 Author k...@chromium.org Date 2013-02-06 10:56:35 -0800 (Wed, 06 Feb 2013) Log Message Merge 141540 > [Chromium] WebViewTest.SetCompositionFromExistingText failing after r141479 > https://bugs.webkit.org/show_bug.cgi?id=108543 > > Patch by Aurimas Liutikas on 2013-01-31 > Reviewed by Ryosuke Niwa. > > Fixing a bug that was uncovered after fixing http://trac.webkit.org/changeset/141479 > > * src/WebViewImpl.cpp: > (WebKit::WebViewImpl::setCompositionFromExistingText): > * tests/WebViewTest.cpp: > Re-enabling the test TBR=commit-qu...@webkit.org Review URL: https://codereview.chromium.org/12233004 Modified Paths branches/chromium/1364/Source/WebKit/chromium/ChangeLog branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp Diff Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (142009 => 142010) --- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-02-06 18:54:06 UTC (rev 142009) +++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-02-06 18:56:35 UTC (rev 142010) @@ -1,3 +1,210 @@ +2013-01-31 Aurimas Liutikas + +[Chromium] WebViewTest.SetCompositionFromExistingText failing after r141479 +https://bugs.webkit.org/show_bug.cgi?id=108543 + +Reviewed by Ryosuke Niwa. + +Fixing a bug that was uncovered after fixing http://trac.webkit.org/changeset/141479 + +* src/WebViewImpl.cpp: +(WebKit::WebViewImpl::setCompositionFromExistingText): +* tests/WebViewTest.cpp: +Re-enabling the test + +2013-01-31 Hajime Morrita + +Unreviewed, followup fix for r141535. + +* tests/WebFrameTest.cpp: + +2013-01-31 Sheriff Bot + +Unreviewed. Rolled Chromium DEPS to r180023. Requested by +thakis_ via sheriffbot. + +* DEPS: + +2013-01-31 Hajime Morrita + +Unreviewed, disabling failing test. + +* tests/WebFrameTest.cpp: + +2013-01-31 Sheriff Bot + +Unreviewed, rolling out r141479. +http://trac.webkit.org/changeset/141479 +https://bugs.webkit.org/show_bug.cgi?id=108564 + +breaks chromium test (Requested by morrita on #webkit). + +* public/WebViewClient.h: +* src/EditorClientImpl.cpp: +(WebKit::EditorClientImpl::respondToChangedSelection): + +2013-01-31 Alec Flett + +IndexedDB: remove old transaction backend bootstrap code +https://bugs.webkit.org/show_bug.cgi?id=103923 + +Reviewed by Dimitri Glazkov. + +Remove all deprecated WebKit APIs from +the IDB backend. + +* WebKit.gyp: +* public/WebIDBCallbacks.h: +(WebKit): +* public/WebIDBDatabase.h: +(WebKit): +* public/WebIDBTransaction.h: Removed. +* public/WebIDBTransactionCallbacks.h: Removed. +* src/AssertMatchingEnums.cpp: +* src/IDBCallbacksProxy.cpp: +* src/IDBDatabaseBackendProxy.cpp: +* src/IDBDatabaseBackendProxy.h: +(IDBDatabaseBackendProxy): +* src/IDBTransactionBackendProxy.cpp: Removed. +* src/IDBTransactionBackendProxy.h: Removed. +* src/IDBTransactionCallbacksProxy.cpp: Removed. +* src/IDBTransactionCallbacksProxy.h: Removed. +* src/WebIDBCallbacksImpl.cpp: +* src/WebIDBDatabaseImpl.cpp: +(WebKit): +* src/WebIDBDatabaseImpl.h: +(WebKit): +(WebIDBDatabaseImpl): +* src/WebIDBTransactionCallbacksImpl.cpp: Removed. +* src/WebIDBTransactionCallbacksImpl.h: Removed. +* src/WebIDBTransactionImpl.cpp: Removed. +* src/WebIDBTransactionImpl.h: Removed. +* tests/IDBAbortOnCorruptTest.cpp: +* tests/IDBDatabaseBackendTest.cpp: + +2013-01-31 Rouslan Solomakhin + +[Chromium] Select multi-word misspelling on context click +https://bugs.webkit.org/show_bug.cgi?id=108509 + +Reviewed by Tony Chang. + +* src/ContextMenuClientImpl.cpp: +(WebKit): +(WebKit::selectMisspellingAsync): Added utility function to get the misspelling for asynchronous spellcheck. +(WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems): Select multi-word misspelling on context click. + +2013-01-31 Florin Malita + +[Chromium] Unreviewed gardening. + +WebViewTest.SetCompositionFromExistingText failing after r141479. + +* tests/WebViewTest.cpp: + +2013-01-31 Alexandre Elias + +[chromium] Rework page scale factor limits initialization +https://bugs.webkit.org/show_bug.cgi?id=108446 + +Reviewed by James Robinson. + +When loading a page with viewportEnabled, both the limits +specified by the viewport tag and the content width need to be +considered before we initialize the minimum page scale (and +pageScaleFactor itself usually to the same value). The timing has +proven
[webkit-changes] [141476] branches/chromium/1364/Source/WebKit/chromium
Title: [141476] branches/chromium/1364/Source/WebKit/chromium
Revision 141476
Author k...@chromium.org
Date 2013-01-31 13:25:49 -0800 (Thu, 31 Jan 2013)
Log Message
Merge 141454
> WebFrameTest.DisambiguationPopup is failing
> https://bugs.webkit.org/show_bug.cgi?id=108160
>
> Patch by Dan Alcantara on 2013-01-31
> Reviewed by Adam Barth.
>
> Fix the unit test so that it is using the right HTML file.
>
> * tests/WebFrameTest.cpp:
TBR=commit-qu...@webkit.org
Review URL: https://codereview.chromium.org/12087118
Modified Paths
branches/chromium/1364/Source/WebKit/chromium/ChangeLog
branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp
Diff
Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (141475 => 141476)
--- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:24:57 UTC (rev 141475)
+++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:25:49 UTC (rev 141476)
@@ -1,5 +1,16 @@
-2013-01-28 Dan Alcantara
+2013-01-31 Dan Alcantara
+WebFrameTest.DisambiguationPopup is failing
+https://bugs.webkit.org/show_bug.cgi?id=108160
+
+Reviewed by Adam Barth.
+
+Fix the unit test so that it is using the right HTML file.
+
+* tests/WebFrameTest.cpp:
+
+2013-01-31 Tony Chang
+
[Chromium, Mobile] Do not show disambiguation pop up in mobile sites
https://bugs.webkit.org/show_bug.cgi?id=107607
Modified: branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp (141475 => 141476)
--- branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 21:24:57 UTC (rev 141475)
+++ branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-31 21:25:49 UTC (rev 141476)
@@ -1638,13 +1638,14 @@
TEST_F(WebFrameTest, DisambiguationPopup)
{
-registerMockedHttpURLLoad("disambiguation_popup.html");
+const std::string htmlFile = "disambiguation_popup.html";
+registerMockedHttpURLLoad(htmlFile);
DisambiguationPopupTestWebViewClient client;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
-WebViewImpl* webViewImpl = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+WebViewImpl* webViewImpl = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
webViewImpl->resize(WebSize(1000, 1000));
webViewImpl->layout();
@@ -1699,13 +1700,14 @@
TEST_F(WebFrameTest, DisambiguationPopupMobileSite)
{
-registerMockedHttpURLLoad("disambiguation_popup_mobile_site.html");
+const std::string htmlFile = "disambiguation_popup_mobile_site.html";
+registerMockedHttpURLLoad(htmlFile);
DisambiguationPopupTestWebViewClient client;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
-WebViewImpl* webViewImpl = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "disambiguation_popup.html", true, 0, &client));
+WebViewImpl* webViewImpl = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + htmlFile, true, 0, &client));
webViewImpl->resize(WebSize(1000, 1000));
webViewImpl->layout();
___
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [141475] branches/chromium/1364/Source/WebKit/chromium
Title: [141475] branches/chromium/1364/Source/WebKit/chromium
Revision 141475
Author k...@chromium.org
Date 2013-01-31 13:24:57 -0800 (Thu, 31 Jan 2013)
Log Message
Merge 141019
> [Chromium, Mobile] Do not show disambiguation pop up in mobile sites
> https://bugs.webkit.org/show_bug.cgi?id=107607
>
> Patch by Dan Alcantara on 2013-01-28
> Reviewed by Adam Barth.
>
> Add a check before showing the disambiguation popup to prevent it from appearing
> on mobile sites. Makes a similar test to the current disambiguation popup test
> that expects the popup to never appear.
>
> * src/WebViewImpl.cpp:
> (WebKit::WebViewImpl::handleGestureEvent):
> (WebKit):
> (WebKit::WebViewImpl::isLikelyMobileSite):
> * src/WebViewImpl.h:
> (WebViewImpl):
> * tests/WebFrameTest.cpp:
> * tests/data/disambiguation_popup_mobile_site.html: Added.
>
> * src/WebViewImpl.cpp:
> (WebKit::WebViewImpl::handleGestureEvent):
> (WebKit):
> (WebKit::WebViewImpl::shouldDisableDesktopWorkarounds):
> * src/WebViewImpl.h:
> (WebViewImpl):
> * tests/WebFrameTest.cpp:
> * tests/data/disambiguation_popup_mobile_site.html: Added.
TBR=commit-qu...@webkit.org
Review URL: https://codereview.chromium.org/12086096
Modified Paths
branches/chromium/1364/Source/WebKit/chromium/ChangeLog
branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.h
branches/chromium/1364/Source/WebKit/chromium/tests/WebFrameTest.cpp
Added Paths
branches/chromium/1364/Source/WebKit/chromium/tests/data/disambiguation_popup_mobile_site.html
Diff
Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (141474 => 141475)
--- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:18:16 UTC (rev 141474)
+++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-31 21:24:57 UTC (rev 141475)
@@ -1,5 +1,34 @@
-2013-01-30 John Knottenbelt
+2013-01-28 Dan Alcantara
+[Chromium, Mobile] Do not show disambiguation pop up in mobile sites
+https://bugs.webkit.org/show_bug.cgi?id=107607
+
+Reviewed by Adam Barth.
+
+Add a check before showing the disambiguation popup to prevent it from appearing
+on mobile sites. Makes a similar test to the current disambiguation popup test
+that expects the popup to never appear.
+
+* src/WebViewImpl.cpp:
+(WebKit::WebViewImpl::handleGestureEvent):
+(WebKit):
+(WebKit::WebViewImpl::isLikelyMobileSite):
+* src/WebViewImpl.h:
+(WebViewImpl):
+* tests/WebFrameTest.cpp:
+* tests/data/disambiguation_popup_mobile_site.html: Added.
+
+* src/WebViewImpl.cpp:
+(WebKit::WebViewImpl::handleGestureEvent):
+(WebKit):
+(WebKit::WebViewImpl::shouldDisableDesktopWorkarounds):
+* src/WebViewImpl.h:
+(WebViewImpl):
+* tests/WebFrameTest.cpp:
+* tests/data/disambiguation_popup_mobile_site.html: Added.
+
+2013-01-28 Stephen Chenney
+
[Chromium] Fix find in page rects for overflowing content.
https://bugs.webkit.org/show_bug.cgi?id=104924
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp (141474 => 141475)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-31 21:18:16 UTC (rev 141474)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-31 21:24:57 UTC (rev 141475)
@@ -728,7 +728,9 @@
hideSelectPopup();
ASSERT(!m_selectPopup);
-if (event.data.tap.width > 0) {
+// Don't trigger a disambiguation popup on sites designed for mobile devices.
+// Instead, assume that the page has been designed with big enough buttons and links.
+if (event.data.tap.width > 0 && !shouldDisableDesktopWorkarounds()) {
IntRect boundingBox(event.x - event.data.tap.width / 2, event.y - event.data.tap.height / 2, event.data.tap.width, event.data.tap.height);
Vector goodTargets;
findGoodTouchTargets(boundingBox, mainFrameImpl()->frame(), pageScaleFactor(), goodTargets);
@@ -4300,4 +4302,11 @@
}
#endif
+bool WebViewImpl::shouldDisableDesktopWorkarounds()
+{
+ViewportArguments arguments = mainFrameImpl()->frame()->document()->viewportArguments();
+return arguments.width == ViewportArguments::ValueDeviceWidth || !arguments.userZoom
+|| (arguments.minZoom == arguments.maxZoom && arguments.minZoom != ViewportArguments::ValueAuto);
+}
+
} // namespace WebKit
Modified: branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.h (141474 => 141475)
--- branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.h 2013-01-31 21:18:16 UTC (rev 141474)
+++ branches/chromium/1364/Source/WebKit/chromium/src/WebViewImpl.h 2013-01-31 21:24:57 UTC (rev 141475)
@@ -596,6 +596,10 @@
virtual bool isPointerLocked();
#endif
+// Heuristic-based function for determining if we should disable wor
[webkit-changes] [140726] branches/chromium/1391a/codereview.settings
Title: [140726] branches/chromium/1391a/codereview.settings Revision 140726 Author k...@chromium.org Date 2013-01-24 14:44:39 -0800 (Thu, 24 Jan 2013) Log Message Setup drover Added Paths branches/chromium/1391a/codereview.settings Diff Copied: branches/chromium/1391a/codereview.settings (from rev 140725, branches/chromium/1364/codereview.settings) (0 => 140726) --- branches/chromium/1391a/codereview.settings (rev 0) +++ branches/chromium/1391a/codereview.settings 2013-01-24 22:44:39 UTC (rev 140726) @@ -0,0 +1,10 @@ +# This file is used by gcl to get repository specific information. +CODE_REVIEW_SERVER: codereview.chromium.org +CC_LIST: chromium-revi...@chromium.org +VIEW_VC: http://src.chromium.org/viewvc/chrome?view=rev&revision= +STATUS: http://chromium-status.appspot.com/status +TRY_ON_UPLOAD: True +TRYSERVER_SVN_URL: svn://svn.chromium.org/chrome-try/try +GITCL_PREUPLOAD: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +LINT_IGNORE_REGEX: webkit/api/.* Property changes: branches/chromium/1391a/codereview.settings Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140725] branches/chromium/1393/codereview.settings
Title: [140725] branches/chromium/1393/codereview.settings Revision 140725 Author k...@chromium.org Date 2013-01-24 14:44:28 -0800 (Thu, 24 Jan 2013) Log Message Setup drover Added Paths branches/chromium/1393/codereview.settings Diff Copied: branches/chromium/1393/codereview.settings (from rev 140724, branches/chromium/1364/codereview.settings) (0 => 140725) --- branches/chromium/1393/codereview.settings (rev 0) +++ branches/chromium/1393/codereview.settings 2013-01-24 22:44:28 UTC (rev 140725) @@ -0,0 +1,10 @@ +# This file is used by gcl to get repository specific information. +CODE_REVIEW_SERVER: codereview.chromium.org +CC_LIST: chromium-revi...@chromium.org +VIEW_VC: http://src.chromium.org/viewvc/chrome?view=rev&revision= +STATUS: http://chromium-status.appspot.com/status +TRY_ON_UPLOAD: True +TRYSERVER_SVN_URL: svn://svn.chromium.org/chrome-try/try +GITCL_PREUPLOAD: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +LINT_IGNORE_REGEX: webkit/api/.* Property changes: branches/chromium/1393/codereview.settings Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140724] branches/chromium/1393/
Title: [140724] branches/chromium/1393/ Revision 140724 Author k...@chromium.org Date 2013-01-24 14:43:36 -0800 (Thu, 24 Jan 2013) Log Message Mini branch for Chrome Added Paths branches/chromium/1393/ Diff Property changes: branches/chromium/1393 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140690] branches/chromium/1391a/Source
Title: [140690] branches/chromium/1391a/Source
Revision 140690
Author k...@chromium.org
Date 2013-01-24 09:28:02 -0800 (Thu, 24 Jan 2013)
Log Message
apply zoom patch
Modified Paths
branches/chromium/1391a/Source/WebCore/page/FrameView.cpp
branches/chromium/1391a/Source/WebCore/page/Page.cpp
branches/chromium/1391a/Source/WebCore/platform/ScrollView.cpp
branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp
Diff
Modified: branches/chromium/1391a/Source/WebCore/page/FrameView.cpp (140689 => 140690)
--- branches/chromium/1391a/Source/WebCore/page/FrameView.cpp 2013-01-24 17:18:17 UTC (rev 140689)
+++ branches/chromium/1391a/Source/WebCore/page/FrameView.cpp 2013-01-24 17:28:02 UTC (rev 140690)
@@ -1992,7 +1992,7 @@
if (!frame()->view())
return;
-if (needsLayout())
+if (!useFixedLayout() && needsLayout())
layout();
#if USE(ACCELERATED_COMPOSITING)
Modified: branches/chromium/1391a/Source/WebCore/page/Page.cpp (140689 => 140690)
--- branches/chromium/1391a/Source/WebCore/page/Page.cpp 2013-01-24 17:18:17 UTC (rev 140689)
+++ branches/chromium/1391a/Source/WebCore/page/Page.cpp 2013-01-24 17:28:02 UTC (rev 140690)
@@ -723,9 +723,10 @@
Document* document = mainFrame()->document();
FrameView* view = document->view();
-if (scale == m_pageScaleFactor) {
+if (m_pageScaleFactor == scale) {
if (view && (view->scrollPosition() != origin || view->delegatesScrolling())) {
-document->updateLayoutIgnorePendingStylesheets();
+if (!m_settings->applyPageScaleFactorInCompositor())
+document->updateLayoutIgnorePendingStylesheets();
view->setScrollPosition(origin);
}
return;
@@ -748,7 +749,7 @@
#endif
if (view && view->scrollPosition() != origin) {
-if (document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
+if (!m_settings->applyPageScaleFactorInCompositor() && document->renderer() && document->renderer()->needsLayout() && view->didFirstLayout())
view->layout();
view->setScrollPosition(origin);
}
Modified: branches/chromium/1391a/Source/WebCore/platform/ScrollView.cpp (140689 => 140690)
--- branches/chromium/1391a/Source/WebCore/platform/ScrollView.cpp 2013-01-24 17:18:17 UTC (rev 140689)
+++ branches/chromium/1391a/Source/WebCore/platform/ScrollView.cpp 2013-01-24 17:28:02 UTC (rev 140690)
@@ -288,6 +288,8 @@
return;
m_fixedLayoutSize = newSize;
updateScrollbars(scrollOffset());
+if (useFixedLayout())
+contentsResized();
}
bool ScrollView::useFixedLayout() const
@@ -301,6 +303,7 @@
return;
m_useFixedLayout = enable;
updateScrollbars(scrollOffset());
+contentsResized();
}
IntSize ScrollView::contentsSize() const
Modified: branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp (140689 => 140690)
--- branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 17:18:17 UTC (rev 140689)
+++ branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 17:28:02 UTC (rev 140690)
@@ -1661,11 +1661,6 @@
#if ENABLE(VIEWPORT)
if (settings()->viewportEnabled()) {
-if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
-// Relayout immediately to obtain the new content width, which is needed
-// to calculate the minimum scale limit.
-view->layout();
-}
computePageScaleFactorLimits();
// When the device rotates:
@@ -3106,6 +3101,10 @@
FrameView* view = page()->mainFrame()->view();
+// Layout to refresh to the latest contents width.
+if (view->needsLayout())
+view->layout();
+
m_minimumPageScaleFactor = min(max(m_pageDefinedMinimumPageScaleFactor, minPageScaleFactor), maxPageScaleFactor);
m_maximumPageScaleFactor = max(min(m_pageDefinedMaximumPageScaleFactor, maxPageScaleFactor), minPageScaleFactor);
if (!m_webSettings->applyDeviceScaleFactorInCompositor()) {
Modified: branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp (140689 => 140690)
--- branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-24 17:18:17 UTC (rev 140689)
+++ branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-24 17:28:02 UTC (rev 140690)
@@ -238,6 +238,8 @@
WebView* webView = static_cast(FrameTestHelpers::createWebViewAndLoad(m_baseURL + "no_viewport_tag.html", true, 0, &client));
+webView->settings()->setApplyDeviceScaleFactorInCompositor(true);
+webView->settings()->setApplyPageScaleFactorInCompositor(true);
webView->settings()->setViewportEnabled(true);
webView->enableFixedLayoutMode(true);
webView->resize(WebSize(viewportWidth, viewportHeight));
@@ -245,17 +247,15 @@
EXPECT_EQ(2, webView->deviceScaleFactor());
[webkit-changes] [140646] branches/chromium/1391a/Source/WebKit/chromium
Title: [140646] branches/chromium/1391a/Source/WebKit/chromium
Revision 140646
Author k...@chromium.org
Date 2013-01-23 21:10:13 -0800 (Wed, 23 Jan 2013)
Log Message
one more patch
Modified Paths
branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp
Diff
Modified: branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp (140645 => 140646)
--- branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 04:56:03 UTC (rev 140645)
+++ branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 05:10:13 UTC (rev 140646)
@@ -1155,7 +1155,7 @@
// (after double tap, find in page, etc), though the user should still
// be allowed to manually pinch zoom in further if they desire.
const float defaultScaleWhenAlreadyLegible = m_minimumPageScaleFactor * doubleTapZoomAlreadyLegibleRatio;
-float legibleScale = deviceScaleFactor();
+float legibleScale = settingsImpl()->applyDeviceScaleFactorInCompositor() ? 1 : deviceScaleFactor();
#if ENABLE(TEXT_AUTOSIZING)
if (page() && page()->settings())
legibleScale *= page()->settings()->textAutosizingFontScaleFactor();
@@ -1163,8 +1163,12 @@
if (legibleScale < defaultScaleWhenAlreadyLegible)
legibleScale = (scale == m_minimumPageScaleFactor) ? defaultScaleWhenAlreadyLegible : m_minimumPageScaleFactor;
-const float defaultMargin = doubleTapZoomContentDefaultMargin * deviceScaleFactor();
-const float minimumMargin = doubleTapZoomContentMinimumMargin * deviceScaleFactor();
+float defaultMargin = doubleTapZoomContentDefaultMargin;
+float minimumMargin = doubleTapZoomContentMinimumMargin;
+if (!settingsImpl()->applyDeviceScaleFactorInCompositor()) {
+defaultMargin *= deviceScaleFactor();
+minimumMargin *= deviceScaleFactor();
+}
// We want the margins to have the same physical size, which means we
// need to express them in post-scale size. To do that we'd need to know
// the scale we're scaling to, but that depends on the margins. Instead
@@ -1175,7 +1179,10 @@
static_cast(defaultMargin * rect.width / m_size.width),
static_cast(minimumMargin * rect.width / m_size.width));
// Fit block to screen, respecting limits.
-scale *= static_cast(m_size.width) / rect.width;
+if (settingsImpl()->applyPageScaleFactorInCompositor())
+scale = static_cast(m_size.width) / rect.width;
+else
+scale *= static_cast(m_size.width) / rect.width;
scale = min(scale, legibleScale);
scale = clampPageScaleFactorToLimits(scale);
@@ -1200,8 +1207,12 @@
// double-tap zoom strategy (fitting the containing block to the screen)
// though.
-float screenHeight = m_size.height / scale * pageScaleFactor();
-float screenWidth = m_size.width / scale * pageScaleFactor();
+float screenHeight = m_size.height / scale;
+float screenWidth = m_size.width / scale;
+if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
+screenHeight *= pageScaleFactor();
+screenWidth *= pageScaleFactor();
+}
// Scroll to vertically align the block.
if (rect.height < screenHeight) {
@@ -1225,8 +1236,10 @@
scale = clampPageScaleFactorToLimits(scale);
scroll = mainFrameImpl()->frameView()->windowToContents(scroll);
-float scaleDelta = scale / pageScaleFactor();
-scroll = WebPoint(scroll.x * scaleDelta, scroll.y * scaleDelta);
+if (!settingsImpl()->applyPageScaleFactorInCompositor()) {
+float scaleDelta = scale / pageScaleFactor();
+scroll = WebPoint(scroll.x * scaleDelta, scroll.y * scaleDelta);
+}
if (!isAnchor)
scroll = clampOffsetAtScale(scroll, scale);
}
Modified: branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp (140645 => 140646)
--- branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-24 04:56:03 UTC (rev 140645)
+++ branches/chromium/1391a/Source/WebKit/chromium/tests/WebFrameTest.cpp 2013-01-24 05:10:13 UTC (rev 140646)
@@ -337,13 +337,15 @@
webView->layout();
}
-TEST_F(WebFrameTest, DivAutoZoomParamsTest)
+TEST_F(WebFrameTest, DivAutoZoomParamsTestWebKitScaling)
{
registerMockedHttpURLLoad("get_scale_for_auto_zoom_into_div_test.html");
int viewportWidth = 640;
int viewportHeight = 480;
WebKit::WebView* webView = FrameTestHelpers::createWebViewAndLoad(m_baseURL + "get_scale_for_auto_zoom_into_div_test.html");
+webView->settings()->setApplyDeviceScaleFactorInCompositor(false);
+webView->settings()->setApplyPageScaleFactorInCompositor(false);
webView->setDeviceScaleFactor(2.0f);
webView->resize(WebSize(viewportWidth, viewportHeight));
w
[webkit-changes] [140627] branches/chromium/1391a/Source/WebKit/chromium
Title: [140627] branches/chromium/1391a/Source/WebKit/chromium
Revision 140627
Author k...@chromium.org
Date 2013-01-23 18:16:20 -0800 (Wed, 23 Jan 2013)
Log Message
patch for bug 107605
Modified Paths
branches/chromium/1391a/Source/WebKit/chromium/public/WebWidgetClient.h
branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1391a/Source/WebKit/chromium/tests/WebViewTest.cpp
Diff
Modified: branches/chromium/1391a/Source/WebKit/chromium/public/WebWidgetClient.h (140626 => 140627)
--- branches/chromium/1391a/Source/WebKit/chromium/public/WebWidgetClient.h 2013-01-24 02:15:35 UTC (rev 140626)
+++ branches/chromium/1391a/Source/WebKit/chromium/public/WebWidgetClient.h 2013-01-24 02:16:20 UTC (rev 140627)
@@ -165,13 +165,7 @@
virtual bool isPointerLocked() { return false; }
// Called when a gesture event is handled.
-enum EventStatus {
-EventStatusUnprocessed,
-EventStatusProcessed,
-EventStatusCancelled
-};
-virtual void didHandleGestureEvent(const WebGestureEvent& event, EventStatus) { }
-virtual void didHandleGestureEvent(const WebGestureEvent& event, bool eventSwallowed) { } // deprecated
+virtual void didHandleGestureEvent(const WebGestureEvent& event, bool eventCancelled) { }
protected:
~WebWidgetClient() { }
Modified: branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp (140626 => 140627)
--- branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 02:15:35 UTC (rev 140626)
+++ branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-24 02:16:20 UTC (rev 140627)
@@ -697,7 +697,8 @@
#if ENABLE(GESTURE_EVENTS)
bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
{
-WebWidgetClient::EventStatus eventStatus = WebWidgetClient::EventStatusUnprocessed;
+bool eventSwallowed = false;
+bool eventCancelled = false; // for disambiguation
// Handle link highlighting outside the main switch to avoid getting lost in the
// complicated set of cases handled below.
@@ -731,7 +732,7 @@
OwnPtr flingCurve = adoptPtr(Platform::current()->createFlingAnimationCurve(event.sourceDevice, WebFloatPoint(event.data.flingStart.velocityX, event.data.flingStart.velocityY), WebSize()));
m_gestureAnimation = WebActiveGestureAnimation::createAtAnimationStart(flingCurve.release(), this);
scheduleAnimation();
-eventStatus = WebWidgetClient::EventStatusProcessed;
+eventSwallowed = true;
break;
}
case WebInputEvent::GestureFlingCancel:
@@ -739,13 +740,13 @@
m_gestureAnimation.clear();
if (m_layerTreeView)
m_layerTreeView->didStopFlinging();
-eventStatus = WebWidgetClient::EventStatusProcessed;
+eventSwallowed = true;
}
break;
case WebInputEvent::GestureTap: {
m_client->cancelScheduledContentIntents();
if (detectContentOnTouch(WebPoint(event.x, event.y))) {
-eventStatus = WebWidgetClient::EventStatusProcessed;
+eventSwallowed = true;
break;
}
@@ -761,13 +762,14 @@
// FIXME: replace touch adjustment code when numberOfGoodTargets == 1?
// Single candidate case is currently handled by: https://bugs.webkit.org/show_bug.cgi?id=85101
if (goodTargets.size() >= 2 && m_client && m_client->didTapMultipleTargets(event, goodTargets)) {
-eventStatus = WebWidgetClient::EventStatusCancelled;
+eventSwallowed = true;
+eventCancelled = true;
break;
}
}
PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
-eventStatus = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent) ? WebWidgetClient::EventStatusProcessed : WebWidgetClient::EventStatusUnprocessed;
+eventSwallowed = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
if (m_selectPopup && m_selectPopup == selectPopup) {
// That tap triggered a select popup which is the same as the one that
@@ -789,7 +791,7 @@
m_page->contextMenuController()->clearContextMenu();
m_contextMenuAllowed = true;
PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
-eventStatus = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent) ? WebWidgetClient::EventStatusProcessed : WebWidgetClient::EventStatusUnprocessed;
+eventSwallowed = mainFrameImpl()->frame()->eventHandler()->handleGestureEvent(platformEvent);
m_contextMenuAllowed = false;
break;
@@ -797,14 +799,14 @@
case WebInputEvent::GestureTapDown: {
m_client->cancelScheduledContentIntents();
PlatformGestureEventBuilder platformEvent(mainFrameImpl()->frameView(), event);
-
[webkit-changes] [140625] branches/chromium/1391a
Title: [140625] branches/chromium/1391a Revision 140625 Author k...@chromium.org Date 2013-01-23 18:14:15 -0800 (Wed, 23 Jan 2013) Log Message Revert 140206 Modified Paths branches/chromium/1391a/LayoutTests/ChangeLog branches/chromium/1391a/Source/WebCore/ChangeLog branches/chromium/1391a/Source/WebCore/rendering/RenderBox.cpp Removed Paths branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash-expected.txt branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash.html Diff Modified: branches/chromium/1391a/LayoutTests/ChangeLog (140624 => 140625) --- branches/chromium/1391a/LayoutTests/ChangeLog 2013-01-24 02:11:18 UTC (rev 140624) +++ branches/chromium/1391a/LayoutTests/ChangeLog 2013-01-24 02:14:15 UTC (rev 140625) @@ -1,50 +1,3 @@ -2013-01-18 Alpha Lam - -[chromium] Update test expectations - -Unreviewed. Update test expectations to mark test as flaky. - -* platform/chromium/TestExpectations: - -2013-01-18 Alpha Lam - -[chromium] Update test expectations -https://bugs.webkit.org/show_bug.cgi?id=107328 - -Not reviewed. Mark this test as MISSING: -http/tests/cache/cancel-multiple-post-xhrs.html - -* platform/chromium/TestExpectations: - -2013-01-18 Robert Hogan - -fast/inline/fixed-pos-moves-with-abspos-parent-relative-ancestor.html is crashing after r140024 -https://bugs.webkit.org/show_bug.cgi?id=107209 - -Reviewed by David Hyatt. - -* platform/chromium/TestExpectations: - -2013-01-18 Alpha Lam - -[chromium] Layout test rebaselines - -Unreviewed rebaseline. Update test results after Chromium roll in r140190. - -* platform/chromium-win/css2.1/t100801-c544-valgn-03-d-agi-expected.png: -* platform/chromium-win/css2.1/t100801-c544-valgn-03-d-agi-expected.txt: -* platform/chromium/css2.1/t100801-c544-valgn-03-d-agi-expected.txt: Renamed from LayoutTests/platform/chromium-mac/css2.1/t100801-c544-valgn-03-d-agi-expected.txt. - -2013-01-18 Abhishek Arya - -Heap-use-after-free in WebCore::RenderObject::isDescendantOf -https://bugs.webkit.org/show_bug.cgi?id=107226 - -Reviewed by David Hyatt. - -* fast/block/float/overhanging-float-not-removed-crash-expected.txt: Added. -* fast/block/float/overhanging-float-not-removed-crash.html: Added. - 2013-01-18 Chris Hopman Fix scrollRectToVisible in the presence of transforms Deleted: branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash-expected.txt (140624 => 140625) --- branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash-expected.txt 2013-01-24 02:11:18 UTC (rev 140624) +++ branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash-expected.txt 2013-01-24 02:14:15 UTC (rev 140625) @@ -1,2 +0,0 @@ -Bug 107226. Heap-use-after-free in WebCore::RenderObject::isDescendantOf. -PASS. WebKit didn't crash Deleted: branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash.html (140624 => 140625) --- branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash.html 2013-01-24 02:11:18 UTC (rev 140624) +++ branches/chromium/1391a/LayoutTests/fast/block/float/overhanging-float-not-removed-crash.html 2013-01-24 02:14:15 UTC (rev 140625) @@ -1,33 +0,0 @@ - - - - - - - - - - X6DDguzp|m_v c; - - - -#L}|2pqynn - -. - - - - -if (window.testRunner) -testRunner.dumpAsText(); - -document.documentElement.offsetTop; -test1.appendChild(test2); -test2.appendChild(test3); -document.documentElement.offsetTop; -test4.appendChild(test5); -test6.appendChild(test7); -document.documentElement.offsetTop; -document.documentElement.innerHTML = "Bug 107226. Heap-use-after-free in WebCore::RenderObject::isDescendantOf.
PASS. WebKit didn't crash"; - - Modified: branches/chromium/1391a/Source/WebCore/ChangeLog (140624 => 140625) --- branches/chromium/1391a/Source/WebCore/ChangeLog 2013-01-24 02:11:18 UTC (rev 140624) +++ branches/chromium/1391a/Source/WebCore/ChangeLog 2013-01-24 02:14:15 UTC (rev 140625) @@ -1,149 +1,3 @@ -2013-01-18 Brady Eidson - -Rework NetworkProcess resource load identifiers. - and https://bugs.webkit.org/show_bug.cgi?id=107192 - -Reviewed by Alexey Proskuryakov. - -No new tests (No effect in tested configs). - -* WebCore.exp.in: - -Include an identifier argument for synchronous loads: -* loader/LoaderStrategy.cpp: -(WebCore::LoaderStrategy::loadResourceSynchronously): -* loader/LoaderStrategy.h: - -Pass along a unique identifier to the synchronous load: -* loader/FrameLoader.cpp: -(WebCore::FrameLoader::loadResourceSynchronously): - -Remove the "setIdentifier" method: -* loader/ResourceLoader.cpp: -
[webkit-changes] [140555] branches/chromium/1391a/Source
Title: [140555] branches/chromium/1391a/Source
Revision 140555
Author k...@chromium.org
Date 2013-01-23 11:04:28 -0800 (Wed, 23 Jan 2013)
Log Message
mini-mega patch for impl side painting test
Modified Paths
branches/chromium/1391a/Source/Platform/chromium/public/WebLayerTreeView.h
branches/chromium/1391a/Source/WebCore/loader/HistoryController.cpp
branches/chromium/1391a/Source/WebCore/page/FrameView.cpp
branches/chromium/1391a/Source/WebCore/page/FrameView.h
branches/chromium/1391a/Source/WebCore/page/Page.cpp
branches/chromium/1391a/Source/WebCore/platform/ScrollView.cpp
branches/chromium/1391a/Source/WebCore/platform/ScrollView.h
branches/chromium/1391a/Source/WebCore/rendering/RenderLayerCompositor.cpp
branches/chromium/1391a/Source/WebCore/rendering/TextAutosizer.cpp
branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1391a/Source/WebKit/chromium/src/WebViewImpl.h
Diff
Modified: branches/chromium/1391a/Source/Platform/chromium/public/WebLayerTreeView.h (140554 => 140555)
--- branches/chromium/1391a/Source/Platform/chromium/public/WebLayerTreeView.h 2013-01-23 18:54:56 UTC (rev 140554)
+++ branches/chromium/1391a/Source/Platform/chromium/public/WebLayerTreeView.h 2013-01-23 19:04:28 UTC (rev 140555)
@@ -102,10 +102,6 @@
// mode).
virtual WebSize deviceViewportSize() const = 0;
-// Gives the corrected location for an event, accounting for the pinch-zoom transformation
-// in the compositor.
-virtual WebFloatPoint adjustEventPointForPinchZoom(const WebFloatPoint&) const = 0;
-
virtual void setDeviceScaleFactor(float) = 0;
virtual float deviceScaleFactor() const = 0;
Modified: branches/chromium/1391a/Source/WebCore/loader/HistoryController.cpp (140554 => 140555)
--- branches/chromium/1391a/Source/WebCore/loader/HistoryController.cpp 2013-01-23 18:54:56 UTC (rev 140554)
+++ branches/chromium/1391a/Source/WebCore/loader/HistoryController.cpp 2013-01-23 19:04:28 UTC (rev 140555)
@@ -87,8 +87,12 @@
else
item->setScrollPoint(m_frame->view()->scrollPosition());
-item->setPageScaleFactor(m_frame->frameScaleFactor());
-
+Page* page = m_frame->page();
+if (page && page->mainFrame() == m_frame)
+item->setPageScaleFactor(page->pageScaleFactor());
+else
+item->setPageScaleFactor(1);
+
// FIXME: It would be great to work out a way to put this code in WebCore instead of calling through to the client.
m_frame->loader()->client()->saveViewStateToItem(item);
}
Modified: branches/chromium/1391a/Source/WebCore/page/FrameView.cpp (140554 => 140555)
--- branches/chromium/1391a/Source/WebCore/page/FrameView.cpp 2013-01-23 18:54:56 UTC (rev 140554)
+++ branches/chromium/1391a/Source/WebCore/page/FrameView.cpp 2013-01-23 19:04:28 UTC (rev 140555)
@@ -2807,6 +2807,17 @@
return page->chrome()->windowResizerRect();
}
+float FrameView::visibleContentScaleFactor() const
+{
+if (!m_frame || !m_frame->page())
+return 1;
+
+if (!m_frame->settings()->applyPageScaleFactorInCompositor() || m_frame != m_frame->page()->mainFrame())
+return 1;
+
+return m_frame->page()->pageScaleFactor();
+}
+
void FrameView::setVisibleScrollerThumbRect(const IntRect& scrollerThumb)
{
Page* page = m_frame->page();
Modified: branches/chromium/1391a/Source/WebCore/page/FrameView.h (140554 => 140555)
--- branches/chromium/1391a/Source/WebCore/page/FrameView.h 2013-01-23 18:54:56 UTC (rev 140554)
+++ branches/chromium/1391a/Source/WebCore/page/FrameView.h 2013-01-23 19:04:28 UTC (rev 140555)
@@ -183,6 +183,8 @@
virtual IntRect windowResizerRect() const;
+virtual float visibleContentScaleFactor() const OVERRIDE;
+
virtual void setFixedVisibleContentRect(const IntRect&) OVERRIDE;
virtual void setScrollPosition(const IntPoint&) OVERRIDE;
void scrollPositionChangedViaPlatformWidget();
Modified: branches/chromium/1391a/Source/WebCore/page/Page.cpp (140554 => 140555)
--- branches/chromium/1391a/Source/WebCore/page/Page.cpp 2013-01-23 18:54:56 UTC (rev 140554)
+++ branches/chromium/1391a/Source/WebCore/page/Page.cpp 2013-01-23 19:04:28 UTC (rev 140555)
@@ -733,13 +733,15 @@
m_pageScaleFactor = scale;
-if (document->renderer())
-document->renderer()->setNeedsLayout(true);
+if (!m_settings->applyPageScaleFactorInCompositor()) {
+if (document->renderer())
+document->renderer()->setNeedsLayout(true);
-document->recalcStyle(Node::Force);
+document->recalcStyle(Node::Force);
-// Transform change on RenderView doesn't trigger repaint on non-composited contents.
-mainFrame()->view()->invalidateRect(IntRect(LayoutRect::infiniteRect()));
+// Transform change on RenderView doesn't trigger repaint on non-composited contents.
+mainFrame()->view()->invalidateRect(IntRect(LayoutRect::infiniteRect()));
+}
#if USE(ACCELERATED_COMPOSITING)
mainFrame()->deviceOrP
[webkit-changes] [140551] branches/chromium/1391/codereview.settings
Title: [140551] branches/chromium/1391/codereview.settings Revision 140551 Author k...@chromium.org Date 2013-01-23 10:52:24 -0800 (Wed, 23 Jan 2013) Log Message Setup drover Added Paths branches/chromium/1391/codereview.settings Diff Copied: branches/chromium/1391/codereview.settings (from rev 140550, branches/chromium/1364/codereview.settings) (0 => 140551) --- branches/chromium/1391/codereview.settings (rev 0) +++ branches/chromium/1391/codereview.settings 2013-01-23 18:52:24 UTC (rev 140551) @@ -0,0 +1,10 @@ +# This file is used by gcl to get repository specific information. +CODE_REVIEW_SERVER: codereview.chromium.org +CC_LIST: chromium-revi...@chromium.org +VIEW_VC: http://src.chromium.org/viewvc/chrome?view=rev&revision= +STATUS: http://chromium-status.appspot.com/status +TRY_ON_UPLOAD: True +TRYSERVER_SVN_URL: svn://svn.chromium.org/chrome-try/try +GITCL_PREUPLOAD: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD&root=chrome +LINT_IGNORE_REGEX: webkit/api/.* Property changes: branches/chromium/1391/codereview.settings Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140545] branches/chromium/1391/
Title: [140545] branches/chromium/1391/ Revision 140545 Author k...@chromium.org Date 2013-01-23 10:24:21 -0800 (Wed, 23 Jan 2013) Log Message Branch for test build Added Paths branches/chromium/1391/ Diff Property changes: branches/chromium/1391 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140544] branches/chromium/1391a/
Title: [140544] branches/chromium/1391a/ Revision 140544 Author k...@chromium.org Date 2013-01-23 10:23:39 -0800 (Wed, 23 Jan 2013) Log Message Mini branch for test build Added Paths branches/chromium/1391a/ Diff Property changes: branches/chromium/1391a Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [140172] branches/chromium/1387/Source/WebKit/chromium/src
Title: [140172] branches/chromium/1387/Source/WebKit/chromium/src
Revision 140172
Author k...@chromium.org
Date 2013-01-18 10:17:47 -0800 (Fri, 18 Jan 2013)
Log Message
Land two patches for testing
Modified Paths
branches/chromium/1387/Source/WebKit/chromium/src/ChromeClientImpl.cpp
branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.cpp
branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.h
Diff
Modified: branches/chromium/1387/Source/WebKit/chromium/src/ChromeClientImpl.cpp (140171 => 140172)
--- branches/chromium/1387/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2013-01-18 18:02:08 UTC (rev 140171)
+++ branches/chromium/1387/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2013-01-18 18:17:47 UTC (rev 140172)
@@ -96,6 +96,7 @@
#include "WebPopupMenuInfo.h"
#include "WebPopupType.h"
#include "WebSettings.h"
+#include "WebSettingsImpl.h"
#include "WebTextDirection.h"
#include "WebViewClient.h"
#include "WebViewImpl.h"
@@ -643,47 +644,40 @@
if (!m_webView->isFixedLayoutModeEnabled() || !m_webView->client() || !m_webView->page())
return;
-WebViewClient* client = m_webView->client();
-WebSize deviceSize = m_webView->size();
-// If the window size has not been set yet don't attempt to set the viewport
-if (!deviceSize.width || !deviceSize.height)
+IntSize viewportSize = m_webView->dipSize();
+float deviceScaleFactor = m_webView->client()->screenInfo().deviceScaleFactor;
+
+// If the window size has not been set yet don't attempt to set the viewport.
+if (!viewportSize.width() || !viewportSize.height())
return;
-int viewportWidthInDIPs = m_webView->dipSize().width();
-ViewportArguments effectiveViewportArguments;
-int effectiveFallbackWidth;
+ViewportAttributes computed;
if (m_webView->settings()->viewportEnabled()) {
-effectiveViewportArguments = arguments;
-effectiveFallbackWidth = std::max(m_webView->page()->settings()->layoutFallbackWidth(), viewportWidthInDIPs);
+computed = arguments.resolve(viewportSize, viewportSize, m_webView->page()->settings()->layoutFallbackWidth());
} else {
-// This is for Android WebView to use layout width in device-independent pixels.
-// Once WebViewImpl on Android will start using DIP pixels size,
-// dispatchViewportPropertiesDidChange can bail out when viewport is disabled.
-effectiveViewportArguments = ViewportArguments();
-effectiveFallbackWidth = viewportWidthInDIPs;
+// If viewport tag is disabled but fixed layout is still enabled, (for
+// example, on Android WebView with UseWideViewport false), compute
+// based on the default viewport arguments.
+computed = ViewportArguments().resolve(viewportSize, viewportSize, viewportSize.width());
}
-float devicePixelRatio = client->screenInfo().deviceScaleFactor;
-// Call the common viewport computing logic in ViewportArguments.cpp.
-ViewportAttributes computed = computeViewportAttributes(
-effectiveViewportArguments, effectiveFallbackWidth, deviceSize.width, deviceSize.height,
-devicePixelRatio, IntSize(deviceSize.width, deviceSize.height));
-
restrictScaleFactorToInitialScaleIfNotUserScalable(computed);
if (m_webView->ignoreViewportTagMaximumScale()) {
computed.maximumScale = max(computed.maximumScale, m_webView->maxPageScaleFactor);
computed.userScalable = true;
}
+if (!m_webView->settingsImpl()->applyDeviceScaleFactorInCompositor())
+computed.initialScale *= deviceScaleFactor;
-int layoutWidth = computed.layoutSize.width();
-int layoutHeight = computed.layoutSize.height();
-m_webView->setFixedLayoutSize(IntSize(layoutWidth, layoutHeight));
-
bool needInitializePageScale = !m_webView->isPageScaleFactorSet();
-m_webView->setDeviceScaleFactor(devicePixelRatio);
+IntSize fixedLayoutSize = flooredIntSize(computed.layoutSize);
+if (viewportSize.width() > fixedLayoutSize.width())
+fixedLayoutSize = viewportSize;
+m_webView->setFixedLayoutSize(fixedLayoutSize);
+m_webView->setDeviceScaleFactor(deviceScaleFactor);
m_webView->setPageScaleFactorLimits(computed.minimumScale, computed.maximumScale);
if (needInitializePageScale)
-m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale * devicePixelRatio);
+m_webView->setPageScaleFactorPreservingScrollOffset(computed.initialScale);
#endif
}
Modified: branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.cpp (140171 => 140172)
--- branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-18 18:02:08 UTC (rev 140171)
+++ branches/chromium/1387/Source/WebKit/chromium/src/WebViewImpl.cpp 2013-01-18 18:17:47 UTC (rev 140172)
@@ -428,7 +428,6 @@
, m_compositorCreationFailed(false)
, m_recreatingGraphicsContext(false)
, m_compositorSurfaceReady(false)
-, m_d
[webkit-changes] [140165] branches/chromium/1387/
Title: [140165] branches/chromium/1387/ Revision 140165 Author k...@chromium.org Date 2013-01-18 09:38:35 -0800 (Fri, 18 Jan 2013) Log Message Branch for 1387 Added Paths branches/chromium/1387/ Diff Property changes: branches/chromium/1387 Added: svn:ignore depcomp compile config.guess GNUmakefile.in config.sub ltmain.sh aconfig.h.in autom4te.cache missing aclocal.m4 install-sh autotoolsconfig.h.in INSTALL README gtk-doc.make out Makefile.chromium WebKitSupportLibrary.zip WebKitBuild Added: svn:mergeinfo ___ webkit-changes mailing list webkit-changes@lists.webkit.org http://lists.webkit.org/mailman/listinfo/webkit-changes
[webkit-changes] [139813] branches/chromium/1364/Source/WebKit/chromium
Title: [139813] branches/chromium/1364/Source/WebKit/chromium Revision 139813 Author k...@chromium.org Date 2013-01-15 17:38:38 -0800 (Tue, 15 Jan 2013) Log Message Merge 138893 > Add function to move caret selection towards a point > https://bugs.webkit.org/show_bug.cgi?id=105189 > > Patch by Chris Hopman on 2013-01-05 > Reviewed by Eric Seidel. > > This function moves the selection to the corresponding point in the > rootEditableElement of the current selection. Used on Android for > the behavior of insertion handles (i.e. dragging the caret around). > > * public/WebFrame.h: > (WebFrame): > * src/WebFrameImpl.cpp: > (WebKit::WebFrameImpl::moveCaretSelectionTowardsWindowPoint): > (WebKit): > * src/WebFrameImpl.h: > (WebFrameImpl): TBR=commit-qu...@webkit.org Review URL: https://codereview.chromium.org/11931008 Modified Paths branches/chromium/1364/Source/WebKit/chromium/ChangeLog branches/chromium/1364/Source/WebKit/chromium/public/WebFrame.h branches/chromium/1364/Source/WebKit/chromium/src/WebFrameImpl.cpp branches/chromium/1364/Source/WebKit/chromium/src/WebFrameImpl.h Diff Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (139812 => 139813) --- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-16 01:33:30 UTC (rev 139812) +++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-16 01:38:38 UTC (rev 139813) @@ -1,796 +1,3 @@ -2013-01-10 John Mellor - -Fix scale of screen.width, window.outerWidth and @media device-width when page scale not applied in compositor. -https://bugs.webkit.org/show_bug.cgi?id=106460 - -Reviewed by Kenneth Rohde Christiansen. - -1. Exposes the existing applyDeviceScaleFactorInCompositor from -WebSettings on Settings (and stores the value there instead), so it can -be accessed from WebCore. - -2. Changes ChromeClientImpl::windowRect to return values in density -independent (UI) pixels pixels instead of physical screen pixels (see -explanation in Source/WebCore/ChangeLog). - -* src/ChromeClientImpl.cpp: -(WebKit::ChromeClientImpl::windowRect): -Normalizes window rect scale. -* src/WebSettingsImpl.cpp: -(WebKit::WebSettingsImpl::WebSettingsImpl): -(WebKit::WebSettingsImpl::setApplyDeviceScaleFactorInCompositor): -(WebKit::WebSettingsImpl::applyDeviceScaleFactorInCompositor): -(WebKit): -* src/WebSettingsImpl.h: -(WebSettingsImpl): - -2013-01-10 Sheriff Bot - -Unreviewed. Rolled DEPS. - -* DEPS: - -2013-01-10 Dimitri Glazkov - -Unreviewed, rolling out r139227. -http://trac.webkit.org/changeset/139227 -https://bugs.webkit.org/show_bug.cgi?id=106227 - -Broke Win component build. - -* public/WebAccessibilityObject.h: -* public/WebAccessibilityRole.h: -* public/WebActiveWheelFlingParameters.h: -* public/WebAnimationController.h: -* public/WebApplicationCacheHost.h: -* public/WebApplicationCacheHostClient.h: -* public/WebArrayBuffer.h: -* public/WebAudioSourceProvider.h: -* public/WebBatteryStatus.h: -* public/WebBindings.h: -* public/WebBlob.h: -* public/WebCache.h: -* public/WebCachedURLRequest.h: -* public/WebColorChooser.h: -* public/WebColorChooserClient.h: -* public/WebColorName.h: -* public/WebCommonWorkerClient.h: -* public/WebCompositionUnderline.h: -* public/WebCompositorInputHandler.h: -* public/WebConsoleMessage.h: -* public/WebContentDetectionResult.h: -* public/WebContextMenuData.h: -* public/WebCrossOriginPreflightResultCache.h: -* public/WebCursorInfo.h: -* public/WebDOMEvent.h: -* public/WebDOMEventListener.h: -* public/WebDOMStringList.h: -* public/WebDataSource.h: -* public/WebDatabase.h: -* public/WebDateTimeChooserCompletion.h: -* public/WebDateTimeChooserParams.h: -* public/WebDeliveredIntentClient.h: -* public/WebDevToolsAgent.h: -* public/WebDevToolsAgentClient.h: -* public/WebDevToolsFrontend.h: -* public/WebDeviceOrientationClient.h: -* public/WebDeviceOrientationClientMock.h: -* public/WebDeviceOrientationController.h: -* public/WebDocument.h: -* public/WebDraggableRegion.h: -* public/WebExternalPopupMenuClient.h: -* public/WebFileChooserCompletion.h: -* public/WebFileChooserParams.h: -* public/WebFileSystemCallbacks.h: -* public/WebFileSystemEntry.h: -* public/WebFileWriter.h: -* public/WebFileWriterClient.h: -* public/WebFindOptions.h: -* public/WebFont.h: -* public/WebFontCache.h: -* public/WebFontDescription.h: -* public/WebFormControlElement.h: -* public/WebFormEleme
[webkit-changes] [139476] branches/chromium/1364
Title: [139476] branches/chromium/1364 Revision 139476 Author k...@chromium.org Date 2013-01-11 11:49:31 -0800 (Fri, 11 Jan 2013) Log Message Merge 138162 > Text Autosizing: Work out what to do about form controls > https://bugs.webkit.org/show_bug.cgi?id=102560 > > Patch by Tim Volodine on 2012-12-19 > Reviewed by Kenneth Rohde Christiansen. > > Source/WebCore: > > Disallow autosizing of form input controls like buttons, text input fields, selection controls, radio buttons > and check boxes. This is a short term solution to avoid inconsistent autosizing of form controls (which is > worse than not autosizing at all). > > Tests: fast/text-autosizing/form-controls-autosizing-button-input-elements.html >fast/text-autosizing/form-controls-autosizing-checkbox-input-element.html >fast/text-autosizing/form-controls-autosizing-radio-input-element.html >fast/text-autosizing/form-controls-autosizing-select-element.html >fast/text-autosizing/form-controls-autosizing-textfield-input-elements.html > > * rendering/TextAutosizer.cpp: > (WebCore): > (WebCore::formInputTags): > (WebCore::TextAutosizer::isAutosizingContainer): > (WebCore::TextAutosizer::contentHeightIsConstrained): > (WebCore::TextAutosizer::containerShouldBeAutosized): > (WebCore::TextAutosizer::containerContainsOneOfTags): > * rendering/TextAutosizer.h: > > LayoutTests: > > Tests for form input elements autosizing. Added tests to check that various kinds of form elements > don't get autosized, i.e. buttons, textareas, check boxes, radio button and selection menus. > > * fast/text-autosizing/form-controls-autosizing-button-input-elements-expected.html: Added. > * fast/text-autosizing/form-controls-autosizing-button-input-elements.html: Added. > * fast/text-autosizing/form-controls-autosizing-checkbox-input-element-expected.html: Added. > * fast/text-autosizing/form-controls-autosizing-checkbox-input-element.html: Added. > * fast/text-autosizing/form-controls-autosizing-radio-input-element-expected.html: Added. > * fast/text-autosizing/form-controls-autosizing-radio-input-element.html: Added. > * fast/text-autosizing/form-controls-autosizing-select-element-expected.html: Added. > * fast/text-autosizing/form-controls-autosizing-select-element.html: Added. > * fast/text-autosizing/form-controls-autosizing-textfield-input-elements-expected.html: Added. > * fast/text-autosizing/form-controls-autosizing-textfield-input-elements.html: Added. TBR=commit-qu...@webkit.org Review URL: https://codereview.chromium.org/11858022 Modified Paths branches/chromium/1364/LayoutTests/ChangeLog branches/chromium/1364/Source/WebCore/ChangeLog branches/chromium/1364/Source/WebCore/rendering/TextAutosizer.cpp branches/chromium/1364/Source/WebCore/rendering/TextAutosizer.h Added Paths branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-button-input-elements-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-button-input-elements.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-checkbox-input-element-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-checkbox-input-element.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-radio-input-element-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-radio-input-element.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-select-element-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-select-element.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-textfield-input-elements-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/form-controls-autosizing-textfield-input-elements.html Diff Modified: branches/chromium/1364/LayoutTests/ChangeLog (139475 => 139476) --- branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:46:33 UTC (rev 139475) +++ branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:49:31 UTC (rev 139476) @@ -1,5 +1,26 @@ -2013-01-11 Anton Vayvod +2012-12-19 Tim Volodine +Text Autosizing: Work out what to do about form controls +https://bugs.webkit.org/show_bug.cgi?id=102560 + +Reviewed by Kenneth Rohde Christiansen. + +Tests for form input elements autosizing. Added tests to check that various kinds of form elements +don't get autosized, i.e. buttons, textareas, check boxes, radio button and selection menus. + +* fast/text-autosizing/form-controls-autosizing-button-input-elements-expected.html: Added. +* fast/text-autosizing/form-controls-autosizing-button-input-elements.html: Added. +* fast/text-autosizing/form-controls-autosizing-checkbox-input-element-expected.html: Added. +* fast/text-autosizing/form-controls-autosizi
[webkit-changes] [139474] branches/chromium/1364
Title: [139474] branches/chromium/1364 Revision 139474 Author k...@chromium.org Date 2013-01-11 11:45:41 -0800 (Fri, 11 Jan 2013) Log Message Merge 139435 > Text Autosizing - elements much narrower than its parent autosizing clusters should be autosized separately. > https://bugs.webkit.org/show_bug.cgi?id=105188 > > Patch by Anton Vayvod on 2013-01-11 > Reviewed by Kenneth Rohde Christiansen. > > Source/WebCore: > > Some blocks of text might be narrower than their parent clusters and should be autosized separately. > This helps with autosizing for the pages implementing the sidebars as a narrow blocks of text with wide margins and > the main content being positioned atop this margin (or vice versa). > > * rendering/TextAutosizer.cpp: > (WebCore::TextAutosizer::isContainerAutosizingCluster): > > Returns true if the container is more than 200 pixels narrower than its parent cluster's lowest common > ancestor of all the text nodes. > > LayoutTests: > > Checked that a narrow autosizing container becomes an autosizing cluster. > Fixed other tests that used narrow descendant blocks. > > * fast/text-autosizing/cluster-narrow-in-wide-expected.html: > * fast/text-autosizing/cluster-narrow-in-wide-ohidden-expected.html: > * fast/text-autosizing/cluster-narrow-in-wide-ohidden.html: > * fast/text-autosizing/cluster-narrow-in-wide.html: > * fast/text-autosizing/cluster-with-wide-lca-expected.html: > * fast/text-autosizing/cluster-with-wide-lca.html: > * fast/text-autosizing/narrow-child-expected.html: > * fast/text-autosizing/narrow-child.html: TBR=commit-qu...@webkit.org Review URL: https://codereview.chromium.org/11864024 Modified Paths branches/chromium/1364/LayoutTests/ChangeLog branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-ohidden-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-ohidden.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-with-wide-lca-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-with-wide-lca.html branches/chromium/1364/LayoutTests/fast/text-autosizing/narrow-child-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/narrow-child.html branches/chromium/1364/Source/WebCore/ChangeLog branches/chromium/1364/Source/WebCore/rendering/TextAutosizer.cpp Diff Modified: branches/chromium/1364/LayoutTests/ChangeLog (139473 => 139474) --- branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:43:49 UTC (rev 139473) +++ branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:45:41 UTC (rev 139474) @@ -1,5 +1,24 @@ -2012-12-18 Anton Vayvod +2013-01-11 Anton Vayvod +Text Autosizing - elements much narrower than its parent autosizing clusters should be autosized separately. +https://bugs.webkit.org/show_bug.cgi?id=105188 + +Reviewed by Kenneth Rohde Christiansen. + +Checked that a narrow autosizing container becomes an autosizing cluster. +Fixed other tests that used narrow descendant blocks. + +* fast/text-autosizing/cluster-narrow-in-wide-expected.html: +* fast/text-autosizing/cluster-narrow-in-wide-ohidden-expected.html: +* fast/text-autosizing/cluster-narrow-in-wide-ohidden.html: +* fast/text-autosizing/cluster-narrow-in-wide.html: +* fast/text-autosizing/cluster-with-wide-lca-expected.html: +* fast/text-autosizing/cluster-with-wide-lca.html: +* fast/text-autosizing/narrow-child-expected.html: +* fast/text-autosizing/narrow-child.html: + +2013-01-11 Antoine Quint + Text Autosizing: containers wider than their enclosing clusters should be autosized as separate clusters https://bugs.webkit.org/show_bug.cgi?id=103627 Modified: branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-expected.html (139473 => 139474) --- branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-expected.html 2013-01-11 19:43:49 UTC (rev 139473) +++ branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-narrow-in-wide-expected.html 2013-01-11 19:45:41 UTC (rev 139474) @@ -11,14 +11,20 @@ - -This text should be autosized to just 20px computed font size (16 * 400/320), since the float:left causes this to be a new cluster, and it is only 400px wide. + +This text should be autosized to just 30px computed font size (16 * 600/320), since the float:left causes this to be a new cluster, and it is only 600px wide. - -This text should be autosized to 40px computed font-size (16 * 800/320), since despite its width:320px it is part of the 800px wide root cluster. + +This text should not be autosized, since because of its width:320px it becomes a separate cluster. +Lore
[webkit-changes] [139473] branches/chromium/1364
Title: [139473] branches/chromium/1364 Revision 139473 Author k...@chromium.org Date 2013-01-11 11:43:49 -0800 (Fri, 11 Jan 2013) Log Message Merge 138111 > Text Autosizing: containers wider than their enclosing clusters should be autosized as separate clusters > https://bugs.webkit.org/show_bug.cgi?id=103627 > > Patch by Anton Vayvod on 2012-12-18 > Reviewed by Julien Chaffraix. > > Source/WebCore: > > Some blocks of texts might be wider than their parent clusters and need to be autosized separately. > > isAutosizingCluster() now checks for the width of the container being greater than the width of the lowest > common ancestor of the text nodes of the enclosing cluster. This block containing all text is passed to all > tree traversal methods. > An overloaded version is added for cases when we don't have the lowest common ancestor yet. > > The change fixes several cases covered by existing tests. > > * rendering/TextAutosizer.cpp: > (WebCore::TextAutosizer::processSubtree): > > Calls processCluster with a new number of arguments. > > (WebCore::TextAutosizer::processCluster): > > Passes block containing all text nodes into processContainer. Assertion removed since it can no longer be > checked without passing an additional parameter (the parent block containing all text) to the function > for the sake of this assertion only. > > (WebCore::TextAutosizer::processContainer): > > |parentBlockContainingAllText| parameter passed into isAutosizingCluster. > > (WebCore::TextAutosizer::isAutosizingCluster(const RenderBlock*, const RenderBlock*)): > > The overloaded method that is used when the render block checked is already known to be an autosizing > container and there's full information necessary to determine if it's a cluster like the parent block > containing all text within the enclosing cluster. > Considers a block a cluster if it is wider than its parent block containing all text within enclosing > cluster. > > (WebCore::TextAutosizer::isAutosizingCluster(const RenderObject*)): > > The overloaded method that checks for the given object to be an autosizing container first (for > convenience of the caller) and doesn't require information about the parent cluster. Used when such > information is not available, for example, in the process of retrieving the information for the parent > cluster or when looking for the root cluster in the tree. > > (WebCore::TextAutosizer::clusterShouldBeAutosized): > > Passes new parameter to measureDescendantTextWidth. > > (WebCore::TextAutosizer::measureDescendantTextWidth): > > Uses blockContainingAllText parameter to pass to isAutosizingCluster. > > (WebCore::TextAutosizer::findDeepestBlockContainingAllText): > > Assertion removed since it can no longer be checked without passing an additional parameter (the > parent block containing all text) to the function for the sake of this assertion only. > > (WebCore::TextAutosizer::findFirstTextLeafNotInCluster): > Uses shorter isAutosizingCluster call. > > LayoutTests: > > Modified existing tests to reflect the new autosizing approach to handling of the elements that are > wider than the lowest common ancestor of the text nodes of the enclosing autosizing cluster. > > * fast/text-autosizing/cluster-wide-in-narrow-expected.html: > * fast/text-autosizing/cluster-wide-in-narrow.html: > * fast/text-autosizing/wide-child-expected.html: > * fast/text-autosizing/wide-child.html: > * fast/text-autosizing/wide-in-narrow-overflow-scroll-expected.html: > * fast/text-autosizing/wide-in-narrow-overflow-scroll.html: TBR=commit-qu...@webkit.org Review URL: https://codereview.chromium.org/11859014 Modified Paths branches/chromium/1364/LayoutTests/ChangeLog branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-wide-in-narrow-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/cluster-wide-in-narrow.html branches/chromium/1364/LayoutTests/fast/text-autosizing/wide-child-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/wide-child.html branches/chromium/1364/LayoutTests/fast/text-autosizing/wide-in-narrow-overflow-scroll-expected.html branches/chromium/1364/LayoutTests/fast/text-autosizing/wide-in-narrow-overflow-scroll.html branches/chromium/1364/Source/WebCore/ChangeLog branches/chromium/1364/Source/WebCore/rendering/TextAutosizer.cpp branches/chromium/1364/Source/WebCore/rendering/TextAutosizer.h Diff Modified: branches/chromium/1364/LayoutTests/ChangeLog (139472 => 139473) --- branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:41:17 UTC (rev 139472) +++ branches/chromium/1364/LayoutTests/ChangeLog 2013-01-11 19:43:49 UTC (rev 139473) @@ -1,5 +1,22 @@ -2012-12-21 Keishi Hattori +2012-12-18 Anton Vayvod +Text Autosizing: containers wider than their enclosing clusters should be autosized as separate clusters +https://bugs.webkit.org/show_bug.cgi?id=1036
[webkit-changes] [138920] branches/chromium/1364/Source/WebKit/chromium
Title: [138920] branches/chromium/1364/Source/WebKit/chromium Revision 138920 Author k...@chromium.org Date 2013-01-06 15:58:15 -0800 (Sun, 06 Jan 2013) Log Message Merge 138302 > [chromium] Disable color profile support for WebImageSkia users > https://bugs.webkit.org/show_bug.cgi?id=105493 > > Reviewed by Eric Seidel. > > Disable color profiles to prevent null pointer dereference under some > conditions. Tested by unittests at src.chromium.org. > > * src/WebImageSkia.cpp: > (WebKit::WebImage::fromData): > (WebKit::WebImage::framesFromData): > TBR=noel.gor...@gmail.com Review URL: https://codereview.chromium.org/11785017 Modified Paths branches/chromium/1364/Source/WebKit/chromium/ChangeLog branches/chromium/1364/Source/WebKit/chromium/src/WebImageSkia.cpp Diff Modified: branches/chromium/1364/Source/WebKit/chromium/ChangeLog (138919 => 138920) --- branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-06 20:26:23 UTC (rev 138919) +++ branches/chromium/1364/Source/WebKit/chromium/ChangeLog 2013-01-06 23:58:15 UTC (rev 138920) @@ -1,3 +1,364 @@ +2012-12-20 Noel Gordon + +[chromium] Disable color profile support for WebImageSkia users +https://bugs.webkit.org/show_bug.cgi?id=105493 + +Reviewed by Eric Seidel. + +Disable color profiles to prevent null pointer dereference under some +conditions. Tested by unittests at src.chromium.org. + +* src/WebImageSkia.cpp: +(WebKit::WebImage::fromData): +(WebKit::WebImage::framesFromData): + +2012-12-20 Nate Chapin + +Rename shouldBufferData to dataBufferingPolicy +https://bugs.webkit.org/show_bug.cgi?id=105450 + +Reviewed by Alexey Proskuryakov. + +No new tests, simple rename. + +* src/AssociatedURLLoader.cpp: +(WebKit::AssociatedURLLoader::loadAsynchronously): + +2012-12-20 Dominic Mazzoni + +AX: support clickPoint in DRT for chromium +https://bugs.webkit.org/show_bug.cgi?id=97359 + +Reviewed by Chris Fleizach. + +Exposes the clickPoint accessibility method in WebAccessibilityObject. + +* public/WebAccessibilityObject.h: +(WebAccessibilityObject): +* src/WebAccessibilityObject.cpp: +(WebKit::WebAccessibilityObject::clickPoint): +(WebKit): + +2012-12-19 Pavel Feldman + +Web Inspector: introduce Page.captureScreenshot +https://bugs.webkit.org/show_bug.cgi?id=105315 + +Reviewed by Yury Semikhatsky. + +Introduces a way for browser to handle protocol commands: +embedder will ask WebKit whether it should override the command +result and will get a hint value. Based on that hint, browser +will prepare the data and ask WebKit again to patch this data in. + +* public/WebDevToolsAgent.h: +(WebDevToolsAgent): +* src/InspectorClientImpl.cpp: +(WebKit::InspectorClientImpl::captureScreenshot): +(WebKit): +* src/InspectorClientImpl.h: +(InspectorClientImpl): +* src/WebDevToolsAgentImpl.cpp: +(BrowserDataHintStringValues): +(WebKit): +(WebKit::WebDevToolsAgentImpl::WebDevToolsAgentImpl): +(WebKit::WebDevToolsAgentImpl::captureScreenshot): +(WebKit::browserHintToString): +(WebKit::browserHintFromString): +(WebKit::WebDevToolsAgentImpl::sendMessageToFrontend): +(WebKit::WebDevToolsAgent::shouldPatchWithBrowserData): +(WebKit::WebDevToolsAgent::patchWithBrowserData): +* src/WebDevToolsAgentImpl.h: +(WebDevToolsAgentImpl): + +2012-12-20 Sheriff Bot + +Unreviewed, rolling out r138215. +http://trac.webkit.org/changeset/138215 +https://bugs.webkit.org/show_bug.cgi?id=105505 + +it broke downstream compilation with clang (Requested by +loislo on #webkit). + +* public/platform/WebKitPlatformSupport.h: +(WebKit): +(WebKitPlatformSupport): +(WebKit::WebKitPlatformSupport::sharedWorkerRepository): +* src/SharedWorkerRepository.cpp: +(WebKit::sharedWorkerRepository): +(WebCore::SharedWorkerRepository::isAvailable): + +2012-12-19 Mark Pilgrim + +[Chromium] Remove idbFactory from PlatformSupport +https://bugs.webkit.org/show_bug.cgi?id=105460 + +Reviewed by Darin Fisher. + +Part of a larger refactoring series; see tracking bug 82948. + +* WebKit.gyp: +* src/IDBFactoryBackendInterface.cpp: Added. +(WebCore): +(WebCore::IDBFactoryBackendInterface::create): +* src/PlatformSupport.cpp: Removed. + +2012-12-19 Antoine Labour + +[chromium] Remove old setBackingTextureId/setBackingIOSurfaceId API on WebPluginContainer +https://bugs.webkit.org/show_bug.cgi?id=105472 + +Reviewed by James Robinson. + +This is not called anymore by chromium (as of r173545), using +setWe
[webkit-changes] [138269] branches/chromium/1364
Title: [138269] branches/chromium/1364
Revision 138269
Author k...@chromium.org
Date 2012-12-20 10:22:29 -0800 (Thu, 20 Dec 2012)
Log Message
Revert 138207
> Revert 138190
> > Merge 138181
> > > Correct missing touch event handler de-registration for nested Documents and DOMWindows
> > > https://bugs.webkit.org/show_bug.cgi?id=105384
> > >
> > > Reviewed by James Robinson.
> > >
> > > Source/WebCore:
> > >
> > > Correcting case by which a nested DOMWindow wouldn't clean up its event handler references
> > > on its Document when removeAllEventListeners was called. Also, correctly propagating this
> > > from a nested Document to its owner Document.
> > >
> > > Updating fast/events/touch/touch-handler-count.html to catch this bug.
> > >
> > > * dom/Document.cpp:
> > > (WebCore::Document::didRemoveEventTargetNode):
> > > * page/DOMWindow.cpp:
> > > (WebCore::DOMWindow::removeAllEventListeners):
> > >
> > > LayoutTests:
> > >
> > > * fast/events/touch/touch-handler-count-expected.txt:
> > > * fast/events/touch/touch-handler-count.html: Adding case of nested DOMWindows with event handlers.
> > >
> >
> > TBR=le...@chromium.org
> > Review URL: https://codereview.chromium.org/11635026
>
> TBR=le...@chromium.org
> Review URL: https://codereview.chromium.org/11647025
TBR=k...@chromium.org
Review URL: https://codereview.chromium.org/11638044
Modified Paths
branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count-expected.txt
branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count.html
branches/chromium/1364/Source/WebCore/dom/Document.cpp
branches/chromium/1364/Source/WebCore/page/DOMWindow.cpp
Diff
Modified: branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count-expected.txt (138268 => 138269)
--- branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count-expected.txt 2012-12-20 18:21:35 UTC (rev 138268)
+++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count-expected.txt 2012-12-20 18:22:29 UTC (rev 138269)
@@ -71,4 +71,8 @@
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 2
PASS window.internals.touchEventHandlerCount(document) is 0
+Test that nested Documents' touch handlers are properly removed from their parent Document.
+PASS window.internals.touchEventHandlerCount(document) is 0
+PASS window.internals.touchEventHandlerCount(document) is 1
+PASS window.internals.touchEventHandlerCount(document) is 0
Modified: branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count.html (138268 => 138269)
--- branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count.html 2012-12-20 18:21:35 UTC (rev 138268)
+++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-handler-count.html 2012-12-20 18:22:29 UTC (rev 138269)
@@ -204,5 +204,24 @@
shouldBe('window.internals.touchEventHandlerCount(document)', '0');
})();
+debug("Test that nested Documents' touch handlers are properly removed from their parent Document.");
+(function() {
+var iframe = document.createElement('iframe');
+var touchtarget = document.getElementById('touchtarget');
+
+shouldBe('window.internals.touchEventHandlerCount(document)', '0');
+
+touchtarget.appendChild(iframe);
+
+var nestedDocument = iframe.contentWindow.document;
+nestedDocument.open('text/html', 'replace');
+nestedDocument.write("\n");
+nestedDocument.close();
+
+shouldBe('window.internals.touchEventHandlerCount(document)', '1');
+
+touchtarget.removeChild(iframe);
+shouldBe('window.internals.touchEventHandlerCount(document)', '0');
+})();
Modified: branches/chromium/1364/Source/WebCore/dom/Document.cpp (138268 => 138269)
--- branches/chromium/1364/Source/WebCore/dom/Document.cpp 2012-12-20 18:21:35 UTC (rev 138268)
+++ branches/chromium/1364/Source/WebCore/dom/Document.cpp 2012-12-20 18:22:29 UTC (rev 138269)
@@ -5659,6 +5659,9 @@
{
if (m_touchEventTargets.get())
m_touchEventTargets->removeAll(handler);
+if (handler == this)
+if (Document* parentDocument = this->parentDocument())
+parentDocument->didRemoveEventTargetNode(this);
}
#endif
Modified: branches/chromium/1364/Source/WebCore/page/DOMWindow.cpp (138268 => 138269)
--- branches/chromium/1364/Source/WebCore/page/DOMWindow.cpp 2012-12-20 18:21:35 UTC (rev 138268)
+++ branches/chromium/1364/Source/WebCore/page/DOMWindow.cpp 2012-12-20 18:22:29 UTC (rev 138269)
@@ -1685,6 +1685,10 @@
if (DeviceOrientationController* controller = DeviceOrientationController::from(page()))
controller->removeAllDeviceEventListeners(this);
#endif
+#if ENABLE(TOUCH_EVENTS)
+if (Document* document = this->document())
+document->didRemoveEventTargetNode(document);
+#endif
removeAllUnloadEventListeners(this);
removeAllBeforeUnloadEventListeners(this);
__
[webkit-changes] [138267] branches/chromium/1364
Title: [138267] branches/chromium/1364 Revision 138267 Author k...@chromium.org Date 2012-12-20 10:21:28 -0800 (Thu, 20 Dec 2012) Log Message Revert 138208 > Revert 138189 > > Merge 138095 > > > Input elements with default touch handlers don't update handler counts when changing documents > > > https://bugs.webkit.org/show_bug.cgi?id=105334 > > > > > > Reviewed by James Robinson. > > > > > > Source/WebCore: > > > > > > When an Input element with default touch event handlers changes documents, it failed to > > > update the touch event handler sets in both the old and new document. This patch fixes this > > > case. > > > > > > Test: fast/events/touch/touch-input-element-change-documents.html > > > > > > * dom/Document.h: > > > (WebCore::Document::didRemoveTouchEventTargetNode) This function makes sense when touch > > > handling is enabled, regardless of whether we're tracking the rects. > > > * dom/Document.cpp: > > > * html/HTMLInputElement.cpp: > > > (WebCore::HTMLInputElement::~HTMLInputElement): Switch from didRemoveTouchEventHandler to > > > didRemoveTouchEventTargetNode, since we don't care about counts in the destructor. > > > (WebCore::HTMLInputElement::updateType): Fixing incorrect indentation. > > > (WebCore::HTMLInputElement::didMoveToNewDocument): Adding the node to the new document and > > > removing it from the old. > > > > > > LayoutTests: > > > > > > * fast/events/touch/touch-input-element-change-documents-expected.txt: Added. > > > * fast/events/touch/touch-input-element-change-documents.html: Added. > > > > > > > TBR=le...@chromium.org > > Review URL: https://codereview.chromium.org/11649024 > > TBR=le...@chromium.org > Review URL: https://codereview.chromium.org/11571072 TBR=k...@chromium.org Review URL: https://codereview.chromium.org/11642045 Modified Paths branches/chromium/1364/Source/WebCore/dom/Document.cpp branches/chromium/1364/Source/WebCore/dom/Document.h branches/chromium/1364/Source/WebCore/html/HTMLInputElement.cpp Added Paths branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html Diff Copied: branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt (from rev 138207, branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt) (0 => 138267) --- branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt (rev 0) +++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt 2012-12-20 18:21:28 UTC (rev 138267) @@ -0,0 +1,12 @@ +This test checks that we correctly update the touch event handler count when an Input element with default touch handlers changes documents. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + +PASS window.internals.touchEventHandlerCount(document) is 0 +PASS window.internals.touchEventHandlerCount(document) is 0 +PASS window.internals.touchEventHandlerCount(document) is 2 +PASS window.internals.touchEventHandlerCount(document) is 3 +PASS window.internals.touchEventHandlerCount(document) is 2 +PASS window.internals.touchEventHandlerCount(document) is 0 + Property changes: branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents-expected.txt Added: svn:mergeinfo Copied: branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html (from rev 138207, branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html) (0 => 138267) --- branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html (rev 0) +++ branches/chromium/1364/LayoutTests/fast/events/touch/touch-input-element-change-documents.html 2012-12-20 18:21:28 UTC (rev 138267) @@ -0,0 +1,30 @@ +