Changeset 54331 in webkit

Timestamp:

Feb 4, 2010 12:41:50 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-04 Jeremy Moskovich <​jeremy@chromium.org>

Reviewed by David Levin.

[Chromium] WebKit side of "Writing direction" context menu on OS X.
​https://bugs.webkit.org/show_bug.cgi?id=34524

• public/WebContextMenuData.h: (WebKit::WebContextMenuData::):
• src/ContextMenuClientImpl.cpp: (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebContextMenuData.h (modified) (1 diff)
• src/ContextMenuClientImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-02-04  Jeremy Moskovich  <jeremy@chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] WebKit side of "Writing direction" context menu on OS X.
+        https://bugs.webkit.org/show_bug.cgi?id=34524
+
+        * public/WebContextMenuData.h:
+        (WebKit::WebContextMenuData::):
+        * src/ContextMenuClientImpl.cpp:
+        (WebKit::ContextMenuClientImpl::getCustomMenuFromDefaultItems):
+
 2010-02-03  Drew Wilson  <atwilson@chromium.org>
 

trunk/WebKit/chromium/public/WebContextMenuData.h

@@ -98 +98 @@
     bool isEditable;
 
+    enum CheckableMenuItemFlags {
+        CheckableMenuItemDisabled = 0x0,
+        CheckableMenuItemEnabled = 0x1,
+        CheckableMenuItemChecked = 0x2,
+    };
+
+    // Writing direction menu items.
+    // Currently only used on OS X.
+    int writingDirectionDefault;
+    int writingDirectionLeftToRight;
+    int writingDirectionRightToLeft;
+
     enum EditFlags {
         CanDoNone = 0x0,

trunk/WebKit/chromium/src/ContextMenuClientImpl.cpp

@@ -32 +32 @@
 #include "ContextMenuClientImpl.h"
 
+#include "CSSPropertyNames.h"
+#include "CSSStyleDeclaration.h"
 #include "ContextMenu.h"
 #include "Document.h"
@@ -201 +203 @@
         }
     }
+
+#if OS(DARWIN)
+    // Writing direction context menu.
+    data.writingDirectionDefault = WebContextMenuData::CheckableMenuItemDisabled;
+    data.writingDirectionLeftToRight = WebContextMenuData::CheckableMenuItemEnabled;
+    data.writingDirectionRightToLeft = WebContextMenuData::CheckableMenuItemEnabled;
+
+    ExceptionCode ec = 0;
+    RefPtr<CSSStyleDeclaration> style = selectedFrame->document()->createCSSStyleDeclaration();
+    style->setProperty(CSSPropertyDirection, "ltr", false, ec);
+    if (selectedFrame->editor()->selectionHasStyle(style.get()) != FalseTriState)
+        data.writingDirectionLeftToRight |= WebContextMenuData::CheckableMenuItemChecked;
+    style->setProperty(CSSPropertyDirection, "rtl", false, ec);
+    if (selectedFrame->editor()->selectionHasStyle(style.get()) != FalseTriState)
+        data.writingDirectionRightToLeft |= WebContextMenuData::CheckableMenuItemChecked;
+#endif // OS(DARWIN)
 
     // Now retrieve the security info.