Changeset 144221 in webkit
- Timestamp:
- Feb 27, 2013 12:20:37 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r144220 r144221 1 2013-02-27 Manuel Rego Casasnovas <rego@igalia.com> 2 3 Add smartInsertDeleteEnabled setting to WebCore::Page 4 https://bugs.webkit.org/show_bug.cgi?id=107840 5 6 Reviewed by Ryosuke Niwa. 7 8 Replace testRunner.setSmartInsertDeleteEnabled by 9 internals.settings.setSmartInsertDeleteEnabled in tests. 10 11 * editing/deleting/smart-editing-disabled.html: 12 * editing/selection/doubleclick-beside-cr-span.html: 13 * editing/selection/doubleclick-whitespace-crash.html: 14 * editing/selection/doubleclick-whitespace-img-crash.html: 15 * editing/selection/doubleclick-whitespace.html: 16 * platform/wk2/TestExpectations: Unflag 17 editing/deleting/smart-editing-disabled.html as it passes now. 18 1 19 2013-02-27 Chris Fleizach <cfleizach@apple.com> 2 20 -
trunk/LayoutTests/editing/deleting/smart-editing-disabled.html
r124691 r144221 5 5 if (window.testRunner) { 6 6 testRunner.dumpAsText(); 7 testRunner.setSmartInsertDeleteEnabled(false);7 internals.settings.setSmartInsertDeleteEnabled(false); 8 8 } 9 9 -
trunk/LayoutTests/editing/selection/doubleclick-beside-cr-span.html
r120173 r144221 4 4 if (window.testRunner) { 5 5 testRunner.dumpAsText(); 6 testRunner.setSmartInsertDeleteEnabled(false);6 internals.settings.setSmartInsertDeleteEnabled(false); 7 7 testRunner.setSelectTrailingWhitespaceEnabled(true); 8 8 } -
trunk/LayoutTests/editing/selection/doubleclick-whitespace-crash.html
r120173 r144221 4 4 if (window.testRunner) { 5 5 testRunner.dumpAsText(); 6 testRunner.setSmartInsertDeleteEnabled(false);6 internals.settings.setSmartInsertDeleteEnabled(false); 7 7 testRunner.setSelectTrailingWhitespaceEnabled(true); 8 8 } -
trunk/LayoutTests/editing/selection/doubleclick-whitespace-img-crash.html
r120173 r144221 4 4 if (window.testRunner) { 5 5 testRunner.dumpAsText(); 6 testRunner.setSmartInsertDeleteEnabled(false);6 internals.settings.setSmartInsertDeleteEnabled(false); 7 7 testRunner.setSelectTrailingWhitespaceEnabled(true); 8 8 testRunner.waitUntilDone(); -
trunk/LayoutTests/editing/selection/doubleclick-whitespace.html
r120173 r144221 4 4 if (window.testRunner) { 5 5 testRunner.dumpAsText(); 6 testRunner.setSmartInsertDeleteEnabled(false);6 internals.settings.setSmartInsertDeleteEnabled(false); 7 7 testRunner.setSelectTrailingWhitespaceEnabled(true); 8 8 } -
trunk/LayoutTests/platform/wk2/TestExpectations
r144152 r144221 367 367 # WebKitTestRunner should dump text/plain content as text 368 368 http/tests/incremental/slow-utf8-text.pl 369 370 # WebKitTestRunner needs layoutTestController.setSmartInsertDeleteEnabled371 editing/deleting/smart-editing-disabled.html372 369 373 370 # WebKitTestRunner needs plainText.plainText -
trunk/Source/WebCore/ChangeLog
r144220 r144221 1 2013-02-27 Manuel Rego Casasnovas <rego@igalia.com> 2 3 Add smartInsertDeleteEnabled setting to WebCore::Page 4 https://bugs.webkit.org/show_bug.cgi?id=107840 5 6 Reviewed by Ryosuke Niwa. 7 8 Covered by editing/deleting/smart-editing-disabled.html. 9 10 * page/Settings.in: Add new setting with true as initial value. 11 1 12 2013-02-27 Chris Fleizach <cfleizach@apple.com> 2 13 -
trunk/Source/WebCore/page/Settings.in
r143804 r144221 195 195 196 196 logsPageMessagesToSystemConsoleEnabled initial=false 197 198 smartInsertDeleteEnabled initial=true -
trunk/Source/WebKit2/ChangeLog
r144218 r144221 1 2013-02-27 Manuel Rego Casasnovas <rego@igalia.com> 2 3 Add smartInsertDeleteEnabled setting to WebCore::Page 4 https://bugs.webkit.org/show_bug.cgi?id=107840 5 6 Reviewed by Ryosuke Niwa. 7 8 * Shared/WebPageCreationParameters.cpp: 9 (WebKit::WebPageCreationParameters::encode): 10 (WebKit::WebPageCreationParameters::decode): Remove code related to 11 isSmartInsertDeleteEnabled. 12 * Shared/WebPageCreationParameters.h: 13 (WebPageCreationParameters): Remove isSmartInsertDeleteEnabled. 14 * Shared/WebPreferencesStore.h: 15 (WebKit): Add macro for smartInsertDeleteEnabled setting. 16 * UIProcess/API/C/WKPreferences.cpp: 17 (WKPreferencesSetSmartInsertDeleteEnabled): 18 (WKPreferencesGetSmartInsertDeleteEnabled): Implement methods using the 19 new setting. 20 * UIProcess/API/C/WKPreferencesPrivate.h: Add new methods headers. 21 * UIProcess/WebPageProxy.cpp: 22 (WebKit::WebPageProxy::initializeWebPage): Set smartInsertDeleteEnabled 23 setting using m_isSmartInsertDeleteEnabled to keep initial value on Mac. 24 (WebKit::WebPageProxy::creationParameters): Remove usage of 25 parameters.isSmartInsertDeleteEnabled. 26 * WebProcess/WebCoreSupport/WebEditorClient.cpp: 27 (WebKit::WebEditorClient::smartInsertDeleteEnabled): Enable method for 28 all platforms. 29 * WebProcess/WebPage/WebPage.cpp: 30 (WebKit::WebPage::WebPage): Remove m_isSmartInsertDeleteEnabled 31 initialization. 32 (WebKit::WebPage::updatePreferences): Set smartInsertDeleteEnabled 33 setting. 34 (WebKit::WebPage::isSmartInsertDeleteEnabled): Implement method using 35 settings. 36 (WebKit): 37 (WebKit::WebPage::setSmartInsertDeleteEnabled): Implement method using 38 settings. 39 * WebProcess/WebPage/WebPage.h: 40 (WebPage): Enable methods dealing with smartInsertDeleteEnabled for all 41 platforms and remove m_isSmartInsertDeleteEnabled as it will be a 42 setting. 43 44 1 45 2013-02-27 Anders Carlsson <andersca@apple.com> 2 46 -
trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp
r141619 r144221 61 61 62 62 #if PLATFORM(MAC) 63 encoder << isSmartInsertDeleteEnabled;64 63 encoder.encodeEnum(layerHostingMode); 65 64 encoder << colorSpace; … … 121 120 122 121 #if PLATFORM(MAC) 123 if (!decoder.decode(parameters.isSmartInsertDeleteEnabled))124 return false;125 122 if (!decoder.decodeEnum(parameters.layerHostingMode)) 126 123 return false; -
trunk/Source/WebKit2/Shared/WebPageCreationParameters.h
r141619 r144221 89 89 90 90 #if PLATFORM(MAC) 91 bool isSmartInsertDeleteEnabled;92 91 LayerHostingMode layerHostingMode; 93 92 ColorSpaceData colorSpace; -
trunk/Source/WebKit2/Shared/WebPreferencesStore.h
r141619 r144221 141 141 macro(LogsPageMessagesToSystemConsoleEnabled, logsPageMessagesToSystemConsoleEnabled, Bool, bool, false) \ 142 142 macro(PageVisibilityBasedProcessSuppressionEnabled, pageVisibilityBasedProcessSuppressionEnabled, Bool, bool, false) \ 143 macro(SmartInsertDeleteEnabled, smartInsertDeleteEnabled, Bool, bool, true) \ 143 144 \ 144 145 -
trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp
r141167 r144221 1034 1034 return toImpl(preferencesRef)->pageVisibilityBasedProcessSuppressionEnabled(); 1035 1035 } 1036 1037 void WKPreferencesSetSmartInsertDeleteEnabled(WKPreferencesRef preferencesRef, bool enabled) 1038 { 1039 toImpl(preferencesRef)->setSmartInsertDeleteEnabled(enabled); 1040 } 1041 1042 bool WKPreferencesGetSmartInsertDeleteEnabled(WKPreferencesRef preferencesRef) 1043 { 1044 return toImpl(preferencesRef)->smartInsertDeleteEnabled(); 1045 } -
trunk/Source/WebKit2/UIProcess/API/C/WKPreferencesPrivate.h
r141167 r144221 250 250 WK_EXPORT void WKPreferencesResetTestRunnerOverrides(WKPreferencesRef preferencesRef); 251 251 252 // Defaults to true 253 WK_EXPORT void WKPreferencesSetSmartInsertDeleteEnabled(WKPreferencesRef preferences, bool enabled); 254 WK_EXPORT bool WKPreferencesGetSmartInsertDeleteEnabled(WKPreferencesRef preferences); 255 252 256 #ifdef __cplusplus 253 257 } -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r144015 r144221 453 453 m_process->send(Messages::WebPage::SetVisibilityState(m_isVisible ? PageVisibilityStateVisible : PageVisibilityStateHidden, /* isInitialState */ true), m_pageID); 454 454 #endif 455 456 #if PLATFORM(MAC) 457 m_process->send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled), m_pageID); 458 #endif 455 459 } 456 460 … … 3835 3839 3836 3840 #if PLATFORM(MAC) 3837 parameters.isSmartInsertDeleteEnabled = m_isSmartInsertDeleteEnabled;3838 3841 parameters.layerHostingMode = m_layerHostingMode; 3839 3842 parameters.colorSpace = m_pageClient->colorSpace(); -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp
r143926 r144221 83 83 bool WebEditorClient::smartInsertDeleteEnabled() 84 84 { 85 // FIXME: Why isn't this Mac specific like toggleSmartInsertDeleteEnabled?86 #if PLATFORM(MAC)87 85 return m_page->isSmartInsertDeleteEnabled(); 88 #else89 return true;90 #endif91 86 } 92 87 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r143976 r144221 238 238 , m_pdfPluginEnabled(false) 239 239 , m_windowIsVisible(false) 240 , m_isSmartInsertDeleteEnabled(parameters.isSmartInsertDeleteEnabled)241 240 , m_layerHostingMode(parameters.layerHostingMode) 242 241 , m_keyboardEventBeingInterpreted(0) … … 2392 2391 settings->setLogsPageMessagesToSystemConsoleEnabled(store.getBoolValueForKey(WebPreferencesKey::logsPageMessagesToSystemConsoleEnabledKey())); 2393 2392 2393 settings->setSmartInsertDeleteEnabled(store.getBoolValueForKey(WebPreferencesKey::smartInsertDeleteEnabledKey())); 2394 2394 2395 platformPreferencesDidChange(store); 2395 2396 … … 3783 3784 } 3784 3785 3786 bool WebPage::isSmartInsertDeleteEnabled() 3787 { 3788 return m_page->settings()->smartInsertDeleteEnabled(); 3789 } 3790 3791 void WebPage::setSmartInsertDeleteEnabled(bool enabled) 3792 { 3793 m_page->settings()->setSmartInsertDeleteEnabled(enabled); 3794 } 3795 3785 3796 } // namespace WebKit -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r143537 r144221 481 481 void stopSpeaking(); 482 482 483 bool isSmartInsertDeleteEnabled() const { return m_isSmartInsertDeleteEnabled; } 484 #endif 483 #endif 484 485 bool isSmartInsertDeleteEnabled(); 486 void setSmartInsertDeleteEnabled(bool); 485 487 486 488 void replaceSelectionWithText(WebCore::Frame*, const String&); … … 769 771 #endif 770 772 771 #if PLATFORM(MAC)772 void setSmartInsertDeleteEnabled(bool isSmartInsertDeleteEnabled) { m_isSmartInsertDeleteEnabled = isSmartInsertDeleteEnabled; }773 #endif774 775 773 #if ENABLE(CONTEXT_MENUS) 776 774 void didSelectItemFromActiveContextMenu(const WebContextMenuItemData&); … … 822 820 // Whether the containing window is visible or not. 823 821 bool m_windowIsVisible; 824 825 // Whether smart insert/delete is enabled or not.826 bool m_isSmartInsertDeleteEnabled;827 822 828 823 // The frame of the containing window in screen coordinates.
Note: See TracChangeset
for help on using the changeset viewer.