Changeset 60841 in webkit
- Timestamp:
- Jun 8, 2010 6:18:51 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r60840 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 As per discussion in bug 36627, Darin Adler suggested: "before the addition of any new EditingBehavior, 9 I think we to add functions to translate the overall behavior policy into specific behaviors rather than 10 directly saying 'behavior == Mac' or 'behavior == Windows'. Helper functions that expression the different 11 rules in plain language.". Patch addresses this request. 12 13 No behavior change, so no new tests. 14 15 * GNUmakefile.am: 16 * WebCore.pro: 17 * WebCore/WebCore.vcproj/WebCore.vcproj 18 * WebCore/WebCore.xcodeproj/project.pbxproj 19 * page/Settings.cpp: 20 (WebCore::Settings::Settings): 21 * page/Settings.h: Moved out EditingBehavior enum to WebCore/editing/EditingBehaviorTypes.h, 22 and renamed to EditingBehaviorTypes. 23 (WebCore::Settings::setEditingBehaviorType): Renamed from setEditingBehavior. 24 (WebCore::Settings::editingBehaviorType): Renamed from editingBehavior. 25 * editing/EditingBehavior.h: Added. 26 (WebCore::EditingBehavior::EditingBehavior): Class to work as a central point for 27 editing behavior that might have to be handled differently in the different platforms/ports. 28 Class should be not used or instantiated directly, but rather implicitly constructed 29 through the Editor class. 30 (WebCore::EditingBehavior::shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom): 31 (WebCore::EditingBehavior::shouldConsiderSelectionAsDirectional): 32 (WebCore::EditingBehavior::shouldCenterAlignWhenSelectionIsRevealed): 33 * editing/EditingBehaviorTypes.h: Added. 34 (WebCore::): 35 * editing/Editor.cpp: 36 (WebCore::Editor::behavior): Getter for EditingBehavior class. 37 * editing/Editor.h: 38 * editing/EditorCommand.cpp: 39 (WebCore::executeToggleStyle): 40 * editing/SelectionController.cpp: 41 (WebCore::SelectionController::setSelection): 42 (WebCore::SelectionController::setIsDirectional): 43 (WebCore::SelectionController::positionForPlatform): 44 (WebCore::SelectionController::modify): 45 * page/EventHandler.cpp: 46 (WebCore::EventHandler::handleMousePressEventSingleClick): 47 * rendering/RenderBlock.cpp: 48 (WebCore::RenderBlock::positionForPointWithInlineChildren): 49 50 - Call sites will look like: 51 if (frame->editor()->behavior().shouldThisIfThat())) 52 // do something 53 1 54 2010-06-08 Steve Block <steveblock@google.com> 2 55 -
trunk/WebCore/GNUmakefile.am
r60819 r60841 950 950 WebCore/editing/EditCommand.cpp \ 951 951 WebCore/editing/EditCommand.h \ 952 WebCore/editing/EditingBehavior.h \ 953 WebCore/editing/EditingBehaviorTypes.h \ 952 954 WebCore/editing/Editor.cpp \ 953 955 WebCore/editing/Editor.h \ -
trunk/WebCore/WebCore.gypi
r60819 r60841 1293 1293 'editing/EditCommand.cpp', 1294 1294 'editing/EditCommand.h', 1295 'editing/EditingBehavior.h', 1296 'editing/EditingBehaviorTypes.h', 1295 1297 'editing/Editor.cpp', 1296 1298 'editing/Editor.h', -
trunk/WebCore/WebCore.pro
r60819 r60841 1282 1282 editing/DeleteSelectionCommand.h \ 1283 1283 editing/EditCommand.h \ 1284 editing/EditingBehavior.h \ 1284 1285 editing/Editor.h \ 1285 1286 editing/FormatBlockCommand.h \ -
trunk/WebCore/WebCore.vcproj/WebCore.vcproj
r60819 r60841 30514 30514 </File> 30515 30515 <File 30516 RelativePath="..\editing\EditingBehavior.h" 30517 > 30518 </File> 30519 <File 30520 RelativePath="..\editing\EditingBehaviorTypes.h" 30521 > 30522 </File> 30523 <File 30516 30524 RelativePath="..\editing\Editor.cpp" 30517 30525 > -
trunk/WebCore/WebCore.xcodeproj/project.pbxproj
r60827 r60841 1017 1017 4F3289B511A42AAB005ABE7E /* InspectorValues.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */; }; 1018 1018 4F3289B611A42AAB005ABE7E /* InspectorValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F3289B411A42AAB005ABE7E /* InspectorValues.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1019 4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1020 4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1019 1021 4FD8D0F2119C718B002FA825 /* ScriptGCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */; }; 1020 1022 4FD8D0F3119C718B002FA825 /* ScriptGCEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */; }; … … 6645 6647 4F3289B311A42AAB005ABE7E /* InspectorValues.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorValues.cpp; sourceTree = "<group>"; }; 6646 6648 4F3289B411A42AAB005ABE7E /* InspectorValues.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorValues.h; sourceTree = "<group>"; }; 6649 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehavior.h; sourceTree = "<group>"; }; 6650 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; }; 6647 6651 4FD8D0F0119C718B002FA825 /* ScriptGCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptGCEvent.cpp; sourceTree = "<group>"; }; 6648 6652 4FD8D0F1119C718B002FA825 /* ScriptGCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptGCEvent.h; sourceTree = "<group>"; }; … … 13230 13234 isa = PBXGroup; 13231 13235 children = ( 13236 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */, 13237 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */, 13232 13238 ED501DC90B249F3900AE18D9 /* mac */, 13233 13239 93309D87099E64910056E581 /* AppendNodeCommand.cpp */, … … 19435 19441 A7BBE26711AFB3F20005EA03 /* JSHTMLMeterElement.h in Headers */, 19436 19442 B6B0540A11B68F10002564C5 /* IDBObjectStoreImpl.h in Headers */, 19443 4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */, 19444 4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */, 19437 19445 ); 19438 19446 runOnlyForDeploymentPostprocessing = 0; -
trunk/WebCore/editing/Editor.cpp
r60819 r60841 64 64 #include "RenderPart.h" 65 65 #include "ReplaceSelectionCommand.h" 66 #include "Settings.h" 66 67 #include "Sound.h" 67 68 #include "Text.h" … … 96 97 } 97 98 return selection; 99 } 100 101 // Function considers Mac editing behavior a fallback when Page or Settings is not available. 102 EditingBehavior Editor::behavior() const 103 { 104 if (!m_frame || !m_frame->settings()) 105 return EditingBehavior(EditingMacBehavior); 106 107 return EditingBehavior(m_frame->settings()->editingBehaviorType()); 98 108 } 99 109 -
trunk/WebCore/editing/Editor.h
r60819 r60841 30 30 #include "Color.h" 31 31 #include "EditAction.h" 32 #include "EditingBehavior.h" 32 33 #include "EditorDeleteAction.h" 33 34 #include "EditorInsertAction.h" … … 282 283 KillRing* killRing() const { return m_killRing.get(); } 283 284 285 EditingBehavior behavior() const; 286 284 287 PassRefPtr<Range> selectedRange(); 285 288 -
trunk/WebCore/editing/EditorCommand.cpp
r60819 r60841 167 167 Settings* settings = frame->document()->settings(); 168 168 bool styleIsPresent; 169 if (settings && settings->editingBehavior () == EditingMacBehavior)169 if (settings && settings->editingBehaviorType() == EditingMacBehavior) 170 170 styleIsPresent = frame->editor()->selectionStartHasStyle(style.get()); 171 171 else -
trunk/WebCore/editing/SelectionController.cpp
r60819 r60841 165 165 ScrollAlignment alignment; 166 166 167 if (m_frame-> settings() && m_frame->settings()->editingBehavior() == EditingMacBehavior)167 if (m_frame->editor()->behavior().shouldCenterAlignWhenSelectionIsRevealed()) 168 168 alignment = (align == AlignCursorOnScrollAlways) ? ScrollAlignment::alignCenterAlways : ScrollAlignment::alignCenterIfNeeded; 169 169 else … … 244 244 void SelectionController::setIsDirectional(bool isDirectional) 245 245 { 246 Settings* settings = m_frame ? m_frame->settings() : 0; 247 m_isDirectional = !settings || settings->editingBehavior() != EditingMacBehavior || isDirectional; 246 m_isDirectional = !m_frame || m_frame->editor()->behavior().shouldConsiderSelectionAsDirectional() || isDirectional; 248 247 } 249 248 … … 300 299 Position pos; 301 300 Settings* settings = m_frame ? m_frame->settings() : 0; 302 if (settings && settings->editingBehavior () == EditingMacBehavior)301 if (settings && settings->editingBehaviorType() == EditingMacBehavior) 303 302 pos = isGetStart ? m_selection.start() : m_selection.end(); 304 303 else { … … 686 685 break; 687 686 case AlterationExtend: 688 if (!settings || settings->editingBehavior () != EditingMacBehavior || m_selection.isCaret() || !isBoundary(granularity))687 if (!settings || settings->editingBehaviorType() != EditingMacBehavior || m_selection.isCaret() || !isBoundary(granularity)) 689 688 setExtent(position, userTriggered); 690 689 else { -
trunk/WebCore/page/EventHandler.cpp
r60819 r60841 371 371 372 372 ASSERT(m_frame->settings()); 373 if (m_frame->settings()->editingBehavior () == EditingMacBehavior) {373 if (m_frame->settings()->editingBehaviorType() == EditingMacBehavior) { 374 374 // See <rdar://problem/3668157> REGRESSION (Mail): shift-click deselects when selection 375 375 // was created right-to-left -
trunk/WebCore/page/Frame.cpp
r60104 r60841 138 138 , m_ownerElement(ownerElement) 139 139 , m_script(this) 140 , m_editor(this) 140 141 , m_selectionController(this) 141 , m_editor(this)142 142 , m_eventHandler(this) 143 143 , m_animationController(this) -
trunk/WebCore/page/Frame.h
r60104 r60841 340 340 String m_kjsDefaultStatusBarText; 341 341 342 mutable SelectionController m_selectionController;343 342 mutable VisibleSelection m_mark; 344 343 mutable Editor m_editor; 344 mutable SelectionController m_selectionController; 345 345 mutable EventHandler m_eventHandler; 346 346 mutable AnimationController m_animationController; -
trunk/WebCore/page/Settings.cpp
r60819 r60841 114 114 , m_usesEncodingDetector(false) 115 115 , m_allowScriptsToCloseWindows(false) 116 , m_editingBehavior (116 , m_editingBehaviorType( 117 117 #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN)) 118 118 // (PLATFORM(MAC) is always false in Chromium, hence the extra condition.) -
trunk/WebCore/page/Settings.h
r60819 r60841 29 29 30 30 #include "AtomicString.h" 31 #include "EditingBehaviorTypes.h" 31 32 #include "FontRenderingMode.h" 32 33 #include "KURL.h" … … 51 52 }; 52 53 53 // There are multiple editing details that are different on Windows than Macintosh.54 // We use a single switch for all of them. Some examples:55 //56 // 1) Clicking below the last line of an editable area puts the caret at the end57 // of the last line on Mac, but in the middle of the last line on Windows.58 // 2) Pushing the down arrow key on the last line puts the caret at the end of the59 // last line on Mac, but does nothing on Windows. A similar case exists on the60 // top line.61 //62 // This setting is intended to control these sorts of behaviors. There are some other63 // behaviors with individual function calls on EditorClient (smart copy and paste and64 // selecting the space after a double click) that could be combined with this if65 // if possible in the future.66 enum EditingBehavior { EditingMacBehavior, EditingWindowsBehavior };67 68 54 class Settings : public Noncopyable { 69 55 public: … … 271 257 bool allowScriptsToCloseWindows() const { return m_allowScriptsToCloseWindows; } 272 258 273 void setEditingBehavior (EditingBehavior behavior) { m_editingBehavior= behavior; }274 EditingBehavior editingBehavior() const { return static_cast<EditingBehavior>(m_editingBehavior); }275 259 void setEditingBehaviorType(EditingBehaviorType behavior) { m_editingBehaviorType = behavior; } 260 EditingBehaviorType editingBehaviorType() const { return static_cast<EditingBehaviorType>(m_editingBehaviorType); } 261 276 262 void setDownloadableBinaryFontsEnabled(bool); 277 263 bool downloadableBinaryFontsEnabled() const { return m_downloadableBinaryFontsEnabled; } … … 384 370 bool m_usesEncodingDetector : 1; 385 371 bool m_allowScriptsToCloseWindows : 1; 386 unsigned m_editingBehavior : 1;372 unsigned m_editingBehaviorType : 1; 387 373 bool m_downloadableBinaryFontsEnabled : 1; 388 374 bool m_xssAuditorEnabled : 1; -
trunk/WebCore/rendering/RenderBlock.cpp
r60819 r60841 3956 3956 } 3957 3957 3958 Settings* settings = document()->settings(); 3959 bool useWindowsBehavior = settings && settings->editingBehavior() == EditingWindowsBehavior; 3960 3961 if (useWindowsBehavior && !closestBox && lastRootBoxWithChildren) { 3958 bool moveCaretToBoundary = document()->frame()->editor()->behavior().shouldMoveCaretToHorizontalBoundaryWhenPastTopOrBottom(); 3959 3960 if (!moveCaretToBoundary && !closestBox && lastRootBoxWithChildren) { 3962 3961 // y coordinate is below last root line box, pretend we hit it 3963 3962 closestBox = lastRootBoxWithChildren->closestLeafChildForXPos(pointInContents.x()); … … 3965 3964 3966 3965 if (closestBox) { 3967 if ( !useWindowsBehavior&& pointInContents.y() < firstRootBoxWithChildren->lineTop() - verticalLineClickFudgeFactor) {3966 if (moveCaretToBoundary && pointInContents.y() < firstRootBoxWithChildren->lineTop() - verticalLineClickFudgeFactor) { 3968 3967 // y coordinate is above first root line box, so return the start of the first 3969 3968 return VisiblePosition(positionForBox(firstRootBoxWithChildren->firstLeafChild(), true), DOWNSTREAM); … … 3976 3975 if (lastRootBoxWithChildren) { 3977 3976 // We hit this case for Mac behavior when the Y coordinate is below the last box. 3978 ASSERT( !useWindowsBehavior);3977 ASSERT(moveCaretToBoundary); 3979 3978 return VisiblePosition(positionForBox(lastRootBoxWithChildren->lastLeafChild(), false), DOWNSTREAM); 3980 3979 } -
trunk/WebKit/chromium/ChangeLog
r60823 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to 9 EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly. 10 11 * src/WebSettingsImpl.cpp: 12 (WebKit::WebSettingsImpl::setEditingBehavior): 13 1 14 2010-06-07 Tony Chang <tony@chromium.org> 2 15 -
trunk/WebKit/chromium/src/WebSettingsImpl.cpp
r60819 r60841 272 272 void WebSettingsImpl::setEditingBehavior(EditingBehavior behavior) 273 273 { 274 m_settings->setEditingBehavior (static_cast<WebCore::EditingBehavior>(behavior));274 m_settings->setEditingBehaviorType(static_cast<WebCore::EditingBehaviorType>(behavior)); 275 275 } 276 276 -
trunk/WebKit/gtk/ChangeLog
r60834 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to 9 EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly. 10 11 * webkit/webkitprivate.cpp: 12 (WebKit::core): 13 * webkit/webkitprivate.h: 14 * webkit/webkitwebview.cpp: 15 (webkit_web_view_update_settings): 16 (webkit_web_view_settings_notify): 17 1 18 2010-06-08 Xan Lopez <xlopez@igalia.com> 2 19 -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r60834 r60841 131 131 } 132 132 133 WebCore::EditingBehavior core(WebKitEditingBehavior type)134 { 135 return (WebCore::EditingBehavior )type;133 WebCore::EditingBehaviorType core(WebKitEditingBehavior type) 134 { 135 return (WebCore::EditingBehaviorType)type; 136 136 } 137 137 -
trunk/WebKit/gtk/webkit/webkitprivate.h
r60819 r60841 96 96 WebCore::ResourceResponse core(WebKitNetworkResponse* response); 97 97 98 WebCore::EditingBehavior core(WebKitEditingBehavior type);98 WebCore::EditingBehaviorType core(WebKitEditingBehavior type); 99 99 100 100 WebKitSecurityOrigin* kit(WebCore::SecurityOrigin*); -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r60819 r60841 2739 2739 settings->setJavaScriptCanAccessClipboard(javaScriptCanAccessClipboard); 2740 2740 settings->setOfflineWebApplicationCacheEnabled(enableOfflineWebAppCache); 2741 settings->setEditingBehavior (core(editingBehavior));2741 settings->setEditingBehaviorType(core(editingBehavior)); 2742 2742 settings->setAllowUniversalAccessFromFileURLs(enableUniversalAccessFromFileURI); 2743 2743 settings->setAllowFileAccessFromFileURLs(enableFileAccessFromFileURI); … … 2840 2840 settings->setOfflineWebApplicationCacheEnabled(g_value_get_boolean(&value)); 2841 2841 else if (name == g_intern_string("editing-behavior")) 2842 settings->setEditingBehavior (core(static_cast<WebKitEditingBehavior>(g_value_get_enum(&value))));2842 settings->setEditingBehaviorType(core(static_cast<WebKitEditingBehavior>(g_value_get_enum(&value)))); 2843 2843 else if (name == g_intern_string("enable-universal-access-from-file-uris")) 2844 2844 settings->setAllowUniversalAccessFromFileURLs(g_value_get_boolean(&value)); -
trunk/WebKit/mac/ChangeLog
r60821 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to 9 EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly. 10 11 * WebView/WebFrame.mm: 12 (core): 13 * WebView/WebFrameInternal.h: 14 * WebView/WebView.mm: 15 (-[WebView _preferencesChangedNotification:]): 16 1 17 2010-06-06 MORITA Hajime <morrita@google.com> 2 18 -
trunk/WebKit/mac/WebView/WebFrame.mm
r60819 r60841 197 197 } 198 198 199 WebCore::EditingBehavior core(WebKitEditingBehavior behavior)199 WebCore::EditingBehaviorType core(WebKitEditingBehavior behavior) 200 200 { 201 201 switch (behavior) { -
trunk/WebKit/mac/WebView/WebFrameInternal.h
r60819 r60841 72 72 WebCore::EditableLinkBehavior core(WebKitEditableLinkBehavior); 73 73 WebCore::TextDirectionSubmenuInclusionBehavior core(WebTextDirectionSubmenuInclusionBehavior); 74 WebCore::EditingBehavior core(WebKitEditingBehavior);74 WebCore::EditingBehaviorType core(WebKitEditingBehavior); 75 75 76 76 WebView *getWebView(WebFrame *webFrame); -
trunk/WebKit/mac/WebView/WebView.mm
r60819 r60841 1370 1370 settings->setShrinksStandaloneImagesToFit([preferences shrinksStandaloneImagesToFit]); 1371 1371 settings->setEditableLinkBehavior(core([preferences editableLinkBehavior])); 1372 settings->setEditingBehavior (core([preferences editingBehavior]));1372 settings->setEditingBehaviorType(core([preferences editingBehavior])); 1373 1373 settings->setTextDirectionSubmenuInclusionBehavior(core([preferences textDirectionSubmenuInclusionBehavior])); 1374 1374 settings->setDOMPasteAllowed([preferences isDOMPasteAllowed]); -
trunk/WebKit/qt/ChangeLog
r60819 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to 9 EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly. 10 11 * WebCoreSupport/DumpRenderTreeSupportQt.cpp: 12 (DumpRenderTreeSupportQt::setEditingBehavior): 13 1 14 2010-06-07 Anders Bakken <agbakken@gmail.com> 2 15 -
trunk/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
r60819 r60841 477 477 void DumpRenderTreeSupportQt::setEditingBehavior(QWebPage* page, const QString& editingBehavior) 478 478 { 479 WebCore::EditingBehavior coreEditingBehavior;479 WebCore::EditingBehaviorType coreEditingBehavior; 480 480 481 481 if (editingBehavior == "win") … … 492 492 return; 493 493 494 corePage->settings()->setEditingBehavior (coreEditingBehavior);494 corePage->settings()->setEditingBehaviorType(coreEditingBehavior); 495 495 } 496 496 -
trunk/WebKit/win/ChangeLog
r60819 r60841 1 2010-06-08 Antonio Gomes <tonikitoo@webkit.org> 2 3 Reviewed by Ojan Vafai and Darin Adler. 4 5 Refactor platform dependent editing behavior code out of Settings 6 https://bugs.webkit.org/show_bug.cgi?id=39854 7 8 EditingBehavior enum was renamed to EditingBehaviorTypes and moved out from Settings.h to 9 EditingBehaviorTypes.h . Call sites in WebKit/ adjusted accordingly. 10 11 * WebView.cpp: 12 (WebView::notifyPreferencesChanged): 13 1 14 2010-06-04 Alice Liu <alice.liu@apple.com> 2 15 -
trunk/WebKit/win/WebView.cpp
r60819 r60841 4655 4655 if (FAILED(hr)) 4656 4656 return hr; 4657 settings->setEditingBehavior ((EditingBehavior)editingBehavior);4657 settings->setEditingBehaviorType((EditingBehaviorType)editingBehavior); 4658 4658 4659 4659 hr = preferences->usesPageCache(&enabled);
Note: See TracChangeset
for help on using the changeset viewer.